diff --git a/Makefile b/Makefile
index afaacf01ef58f17b74cef51ad698db03b85feb9b..043b23394213afd9aabc86be96369f64e082519d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,20 @@
 REDIS_VERSION ?= v7.0.5
 EXPORTER_VERSION ?= v1.44.0
 
-build-redis-image:
-	docker build -t quay.io/opstree/redis:$(REDIS_VERSION) -f Dockerfile .
+IMG ?= quay.io/opstree/redis:$(REDIS_VERSION)
+EXPORTER_IMG ?= opstree/redis-exporter:$(EXPORTER_VERSION)
 
-build-redis-exporter-image:
-	docker build -t opstree/redis-exporter:$(EXPORTER_VERSION) -f Dockerfile.exporter .
+build-redis:
+	docker build -t ${IMG} -f Dockerfile .
+
+push-redis:
+	docker push ${IMG}
+
+build-redis-exporter:
+	docker build -t ${EXPORTER_IMG} -f Dockerfile.exporter .
+
+push-redis-exporter:
+	docker push ${EXPORTER_IMG}
 
 setup-standalone-server-compose:
 	docker-compose -f docker-compose-standalone.yaml up -d
diff --git a/entrypoint.sh b/entrypoint.sh
index f582657945852836df3ac1e530fa9e7678186a7d..5852b7f87ceb3ddf2faf01f9e3dafde1bd0a4ce7 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -4,7 +4,7 @@ set -a
 
 PERSISTENCE_ENABLED=${PERSISTENCE_ENABLED:-"false"}
 DATA_DIR=${DATA_DIR:-"/data"}
-EXTERNAL_CONFIG_FILE=${EXTERNAL_CONFIG_FILE:-"/etc/redis/external.conf.d/redis-external.conf"}
+EXTERNAL_CONFIG_FILE=${EXTERNAL_CONFIG_FILE:-"/etc/redis/external.conf.d/redis-additional.conf"}
 REDIS_MAJOR_VERSION=${REDIS_MAJOR_VERSION:-"v7"}
 
 apply_permissions() {
diff --git a/healthcheck.sh b/healthcheck.sh
index a38d9b62a1c34c6180ee19885026aa8db817d4a1..184ca1dd37b4fe5f21b08f15180ea4cb30a4db4c 100755
--- a/healthcheck.sh
+++ b/healthcheck.sh
@@ -7,7 +7,7 @@ check_redis_health() {
     if [[ "${TLS_MODE}" == "true" ]]; then
         redis-cli --tls --cert "${REDIS_TLS_CERT}" --key "${REDIS_TLS_CERT_KEY}" --cacert "${REDIS_TLS_CA_KEY}" -h "$(hostname)" ping
     else
-        redis-cli ping
+        redis-cli -h $(hostname) ping
     fi
 }
 
diff --git a/redis.conf b/redis.conf
index 0097fa9e31ae6a98cc988a39440111edd2e6cbbf..1eab05400a7d1fb58b9c30b8fe51713676cba9f5 100755
--- a/redis.conf
+++ b/redis.conf
@@ -1,4 +1,4 @@
-bind 0.0.0.0
+bind 0.0.0.0 ::
 tcp-backlog 511
 timeout 0
 tcp-keepalive 300