diff --git a/.github/workflows/build_containers.yaml b/.github/workflows/build_containers.yaml
index a75870b..354efa2 100644
--- a/.github/workflows/build_containers.yaml
+++ b/.github/workflows/build_containers.yaml
@@ -35,44 +35,40 @@ jobs:
       - name: Build Postgres $IMAGE_TAG_PREFIX-IMAGE_TAG_SUFFIX
         id: build-postgres
         run: |
-          echo "cybertec-pg-container/postgres:$BASEOS-$PGVERSION_FULL-$BUILD $CONTAINER_REPO:postgres-$BASEOS-$PGVERSION_FULL-$BUILD"
+          echo "cybertec-pg-container/postgres:$BASEOS-$PGVERSION_FULL-$BUILD $CONTAINER_REPO/postgres-$BASEOS-$PGVERSION_FULL-$BUILD"
           make postgres
-          echo "fertig"
-          docker images
-          echo *images*
-          docker tag cybertec-pg-container/postgres:$BASEOS-$PGVERSION_FULL-$BUILD $CONTAINER_REPO:postgres-$BASEOS-$PGVERSION_FULL-$BUILD
-          echo "tag"
-          docker save -o postgres.tar $CONTAINER_REPO:postgres-$BASEOS-$PGVERSION_FULL-$BUILD
+          docker tag cybertec-pg-container/postgres:$BASEOS-$PGVERSION_FULL-$BUILD $CONTAINER_REPO/postgres-$BASEOS-$PGVERSION_FULL-$BUILD
+          docker save -o postgres.tar $CONTAINER_REPO/postgres-$BASEOS-$PGVERSION_FULL-$BUILD
 
       - name: Build Postgres with GIS $IMAGE_TAG_PREFIX-$POSTGIS_VERSION-$IMAGE_TAG_SUFFIX
         id: build-postgres-gis
         run: |
-          echo "cybertec-pg-container/postgres:$BASEOS-$PGVERSION_FULL-$BUILD $CONTAINER_REPO:postgres-$BASEOS-$PGVERSION_FULL-$BUILD"
           make postgres-gis
-          docker images
-          docker tag cybertec-pg-container/postgres-gis:$BASEOS-$PGVERSION_FULL-$BUILD $CONTAINER_REPO:postgres-gis-$BASEOS-$PGVERSION_FULL-$POSTGIS_VERSION-$BUILD
-          docker save -o postgres-gis.tar $CONTAINER_REPO:postgres-gis-$BASEOS-$PGVERSION_FULL-$POSTGIS_VERSION-$BUILD
+          docker tag cybertec-pg-container/postgres-gis:$BASEOS-$PGVERSION_FULL-$BUILD $CONTAINER_REPO/postgres-gis-$BASEOS-$PGVERSION_FULL-$POSTGIS_VERSION-$BUILD
+          docker save -o postgres-gis.tar $CONTAINER_REPO/postgres-gis-$BASEOS-$PGVERSION_FULL-$POSTGIS_VERSION-$BUILD
 
       - name: Build pgBackRest
         id: build-pgbackrest
         run: |
           make pgbackrest
-          docker tag cybertec-pg-container/pgbackrest:$BASEOS-$PGVERSION_FULL-$BUILD $CONTAINER_REPO:pgbackrest-$BASEOS-$PGVERSION_FULL-$BUILD
-          docker save -o pgbackrest.tar $CONTAINER_REPO:pgbackrest-$BASEOS-$PGVERSION_FULL-$BUILD
+          docker tag cybertec-pg-container/pgbackrest:$BASEOS-$PGVERSION_FULL-$BUILD $CONTAINER_REPO/pgbackrest-$BASEOS-$PGVERSION_FULL-$BUILD
+          docker save -o pgbackrest.tar $CONTAINER_REPO/pgbackrest-$BASEOS-$PGVERSION_FULL-$BUILD
 
       - name: Build exporter
         id: build-exporter
         run: |
           make exporter
-          docker tag cybertec-pg-container/exporter:$BASEOS-$PGVERSION_FULL-$BUILD $CONTAINER_REPO:exporter-$BASEOS-$PGVERSION_FULL-$BUILD
-          docker save -o exporter.tar $CONTAINER_REPO:exporter-$BASEOS-$PGVERSION_FULL-$BUILD
+          docker images
+          docker tag cybertec-pg-container/exporter:$BASEOS-$PGVERSION_FULL-$BUILD $CONTAINER_REPO/exporter-$BASEOS-$PGVERSION_FULL-$BUILD
+          docker save -o exporter.tar $CONTAINER_REPO/exporter-$BASEOS-$PGVERSION_FULL-$BUILD
 
       - name: Build pgBouncer
         id: build-pgbouncer
         run: |
           make pgbouncer
-          docker tag cybertec-pg-container/pgbouncer:$IMAGE_TAG_PREFIX-$IMAGE_TAG_SUFFIX $CONTAINER_REPO:pgbouncer-$IMAGE_TAG_PREFIX-$IMAGE_TAG_SUFFIX
-          docker save -o pgbouncer.tar $CONTAINER_REPO:pgbouncer-$IMAGE_TAG_PREFIX-$IMAGE_TAG_SUFFIX
+          docker images
+          docker tag cybertec-pg-container/pgbouncer:$IMAGE_TAG_PREFIX-$IMAGE_TAG_SUFFIX $CONTAINER_REPO/pgbouncer-$IMAGE_TAG_PREFIX-$IMAGE_TAG_SUFFIX
+          docker save -o pgbouncer.tar $CONTAINER_REPO/pgbouncer-$IMAGE_TAG_PREFIX-$IMAGE_TAG_SUFFIX
             
       - name: Upload Containers
         uses: actions/upload-artifact@v2