diff --git a/.github/workflows/build-base-images.yaml b/.github/workflows/build-base-images.yaml
index 71d7213..cfcdbcd 100644
--- a/.github/workflows/build-base-images.yaml
+++ b/.github/workflows/build-base-images.yaml
@@ -13,18 +13,18 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v2
 
-    # - name: Log in to Docker Hub
-    #   uses: docker/login-action@v2
-    #   with:
-    #     username: ${{ secrets.DOCKER_USERNAME }}
-    #     password: ${{ secrets.DOCKER_PASSWORD }}
-
-    # - name: Log in to GitHub Container Registry
-    #   uses: docker/login-action@v2
-    #   with:
-    #     registry: ghcr.io
-    #     username: ${{ github.actor }}
-    #     password: ${{ secrets.GITHUB_TOKEN }}
+    - name: Log in to Docker Hub
+      uses: docker/login-action@v2
+      with:
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+
+    - name: Log in to GitHub Container Registry
+      uses: docker/login-action@v2
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
 
     # - name: Build drupal-base-cli image
     #   run: docker build -t uselagoon/drupal-base-cli:latest -t drupal-base-cli -f ./lagoon/cli.dockerfile .
@@ -38,18 +38,19 @@ jobs:
     - name: Build Docker images
       run: docker compose -f docker-compose.yml build
 
+    - name: Tag Docker images
+      run: |
+        docker tag drupal-base-cli:latest uselagoon/drupal-base-image-cli:latest
+        docker tag drupal-base-php:latest uselagoon/drupal-base-image-php:latest
+        docker tag drupal-base-nginx:latest uselagoon/drupal-base-image-nginx:latest
+
     - name: List images
       run: docker image ls
 
-    # - name: Tag Docker images
-    #   run: |
-    #     docker tag your-dockerhub-username/your-app:latest your-dockerhub-username/your-app:main
-    #     docker tag your-dockerhub-username/your-app:latest ghcr.io/your-github-username/your-app:latest
-
     # - name: Push Docker images to Docker Hub
     #   run: |
-    #     docker push your-dockerhub-username/your-app:latest
-    #     docker push your-dockerhub-username/your-app:main
-
+    #     docker push uselagoon/drupal-base-image-cli:latest
+    #     docker push uselagoon/drupal-base-image-php:latest
+    #     docker push uselagoon/drupal-base-image-nginx:latest
     # - name: Push Docker images to GitHub Container Registry
     #   run: docker push ghcr.io/your-github-username/your-app:latest
\ No newline at end of file