diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6f2f176..7d20019 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -55,7 +55,7 @@ jobs:
         with:
           context: .
           push: true
-          tags: ${{ steps.meta.outputs.tags }}
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME}}:${{ env.AEM_SDK_VERSION }}
           platforms: linux/amd64,linux/arm64
           labels: ${{ steps.meta.outputs.labels }}
       - name: Generate artifact attestation
diff --git a/Dockerfile b/Dockerfile
index f6fe388..aca524a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,7 +25,6 @@ RUN chmod +x /usr/local/bin/aem-start
 
 ENV AEM_VENDOR_JAVA_HOME_DIR=$JAVA_HOME
 
-#RUN aem instance -A launch && aem instance down
+RUN aem instance -A launch && aem instance down
 
-#CMD ["/usr/local/bin/aem-start"]
-ENTRYPOINT ["/usr/local/bin/aem"]
+CMD ["/usr/local/bin/aem-start"]