diff --git a/.github/workflows/release-singleimage-test.yml b/.github/workflows/release-singleimage-test.yml
index 6ec109c0e0..196de88172 100644
--- a/.github/workflows/release-singleimage-test.yml
+++ b/.github/workflows/release-singleimage-test.yml
@@ -77,12 +77,13 @@ jobs:
           file: ./hosting/single/Dockerfile
           cache-from: type=registry,ref=budibase/budibase:latest
           cache-to: type=inline
-      # - name: Tag and release Budibase Azure App Service docker image
-      #   uses: docker/build-push-action@v2
-      #   with:
-      #     context: .
-      #     push: true
-      #     platforms: linux/amd64
-      #     build-args: TARGETBUILD=aas
-      #     tags: budibase/budibase-aas,budibase/budibase-aas:${{ env.RELEASE_VERSION }}
-      #     file: ./hosting/single/Dockerfile
+      - name: Tag and release Budibase Azure App Service docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: false
+          pull: true
+          platforms: linux/amd64
+          build-args: TARGETBUILD=aas
+          tags: budibase/budibase-aas,budibase/budibase-aas:${{ env.RELEASE_VERSION }}
+          file: ./hosting/single/Dockerfile
diff --git a/hosting/single/Dockerfile b/hosting/single/Dockerfile
index 1eaf30c2fc..6b185b975e 100644
--- a/hosting/single/Dockerfile
+++ b/hosting/single/Dockerfile
@@ -30,7 +30,7 @@ COPY packages/worker/dist packages/server/dist
 RUN rm -rf scripts/
 
 
-FROM budibase/couchdb
+FROM budibase/couchdb as runner
 ARG TARGETARCH
 ENV TARGETARCH $TARGETARCH
 #TARGETBUILD can be set to single (for single docker image) or aas (for azure app service)