diff --git a/Makefile b/Makefile
index ceb9cec..4db18da 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,7 @@ base: base-build;
 pgbackrest-build:
 		docker build $(ROOTPATH)											\
 			--file $(ROOTPATH)/docker/pgbackrest/Dockerfile 				\
-			--tag cybertec-pg-container/pgbackrest:$(IMAGE_TAG)-$(BUILD) 	\
+			--tag cybertec-pg-container/pgbackrest:$(IMAGE_TAG) 	\
 			--build-arg BASE_IMAGE=$(BASE_IMAGE)							\
 			--build-arg CONTAINERIMAGE=${CONTAINERIMAGE} 					\
 			--build-arg IMAGE_REPOSITORY=$(IMAGE_REPOSITORY)				\
@@ -66,7 +66,7 @@ pgbackrest: pgbackrest-build;
 postgres-build:
 		docker build $(ROOTPATH)												\
 			--file $(ROOTPATH)/docker/postgres/Dockerfile 						\
-			--tag cybertec-pg-container/postgres:$(IMAGE_TAG)-$(BETA)$(BUILD)	\
+			--tag cybertec-pg-container/postgres:$(IMAGE_TAG)	\
 			--build-arg BASE_IMAGE=$(BASE_IMAGE)								\
 			--build-arg CONTAINERIMAGE=${CONTAINERIMAGE} 						\
 			--build-arg IMAGE_REPOSITORY=$(IMAGE_REPOSITORY)					\
@@ -85,7 +85,7 @@ postgres: postgres-build
 postgres-stage-build:
 		docker build $(ROOTPATH)															\
 			--file $(ROOTPATH)/docker/postgres-stage/Dockerfile 							\
-			--tag cybertec-pg-container/postgres-stage:$(PGVERSION_FULL)-$(BETA)$(BUILD)	\
+			--tag cybertec-pg-container/postgres-stage:$(PGVERSION_FULL)					\
 			--build-arg BASE_IMAGE=$(BASE_IMAGE)											\
 			--build-arg CONTAINERIMAGE=${CONTAINERIMAGE} 									\
 			--build-arg IMAGE_REPOSITORY=$(IMAGE_REPOSITORY)								\
@@ -103,7 +103,7 @@ postgres-stage: postgres-stage-build
 postgres-gis-build:
 		docker build $(ROOTPATH)													\
 			--file $(ROOTPATH)/docker/postgres-gis/Dockerfile 						\
-			--tag cybertec-pg-container/postgres-gis:$(IMAGE_TAG)-$(BETA)$(BUILD)	\
+			--tag cybertec-pg-container/postgres-gis:$(IMAGE_TAG)					\
 			--build-arg BASE_IMAGE=$(BASE_IMAGE)									\
 			--build-arg CONTAINERIMAGE=${CONTAINERIMAGE} 							\
 			--build-arg IMAGE_REPOSITORY=$(IMAGE_REPOSITORY)						\
@@ -122,7 +122,7 @@ postgres-gis: postgres-gis-build
 postgres-oracle-build:
 		docker build $(ROOTPATH)														\
 			--file $(ROOTPATH)/docker/postgres-oracle/Dockerfile 						\
-			--tag cybertec-pg-container/postgres-oracle:$(IMAGE_TAG)-$(BETA)$(BUILD)	\
+			--tag cybertec-pg-container/postgres-oracle:$(IMAGE_TAG)					\
 			--build-arg BASE_IMAGE=$(BASE_IMAGE)										\
 			--build-arg CONTAINERIMAGE=${CONTAINERIMAGE} 								\
 			--build-arg IMAGE_REPOSITORY=$(IMAGE_REPOSITORY)							\
@@ -140,7 +140,7 @@ postgres-oracle: postgres-oracle-build
 pgbouncer-build:
 		docker build $(ROOTPATH)														\
 			--file $(ROOTPATH)/docker/pgbouncer/Dockerfile 								\
-			--tag cybertec-pg-container/pgbouncer:$(IMAGE_TAG)-$(BETA)$(BUILD)			\
+			--tag cybertec-pg-container/pgbouncer:$(IMAGE_TAG)							\
 			--build-arg BASE_IMAGE=$(BASE_IMAGE)										\
 			--build-arg CONTAINERIMAGE=${CONTAINERIMAGE} 								\
 			--build-arg IMAGE_REPOSITORY=$(IMAGE_REPOSITORY)							\
@@ -155,7 +155,7 @@ pgbouncer: pgbouncer-build
 exporter-build:
 		docker build $(ROOTPATH)														\
 			--file $(ROOTPATH)/docker/exporter/Dockerfile 								\
-			--tag cybertec-pg-container/exporter:$(IMAGE_TAG)-$(BETA)$(BUILD)			\
+			--tag cybertec-pg-container/exporter:$(IMAGE_TAG)							\
 			--build-arg BASE_IMAGE=$(BASE_IMAGE)										\
 			--build-arg CONTAINERIMAGE=${CONTAINERIMAGE} 								\
 			--build-arg IMAGE_REPOSITORY=$(IMAGE_REPOSITORY)							\