diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index f39d4bb..0c6aba4 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -46,7 +46,7 @@ jobs:
         with:
           containerfiles: Containerfile
           tags: ${{ steps.meta.outputs.tags }}
-          
+
       - name: Push image
         uses: redhat-actions/push-to-registry@v2
         with:
diff --git a/Containerfile b/Containerfile
index a1cbe07..7488139 100644
--- a/Containerfile
+++ b/Containerfile
@@ -9,7 +9,6 @@ ENV IMAGE_TAG="${VERSION}"
 ENV VARIANT="Server"
 ENV VERSION="${VERSION}"
 ENV WEB_UI="false"
-ENV ISO_NAME="${IMAGE_NAME}-${IMAGE_TAG}"
 
 RUN mkdir /build-container-installer
 
diff --git a/Makefile b/Makefile
index 81db881..6338fc4 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,7 @@ ENROLLMENT_PASSWORD =
 SECURE_BOOT_KEY_URL =
 ADDITIONAL_TEMPLATES = 
 ROOTFS_SIZE = 4
+ISO_NAME = $(IMAGE_NAME)-$(IMAGE_TAG)
 
 # Generated vars
 ## Formatting = _UPPERCASE
@@ -39,6 +40,7 @@ build/deploy.iso:  boot.iso container/$(IMAGE_NAME)-$(IMAGE_TAG) xorriso/input.t
 	mkdir $(_BASE_DIR)/build || true
 	xorriso -dialog on < $(_BASE_DIR)/xorriso/input.txt
 	implantisomd5 build/deploy.iso
+	mv build/deploy.iso build/$(ISO_NAME).iso
 
 # Step 1: Generate Lorax Templates
 lorax_templates/post_%.tmpl: lorax_templates/scripts/post/%
diff --git a/entrypoint.sh b/entrypoint.sh
index 78db352..d8602a8 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -14,5 +14,3 @@ make boot.iso $@
 
 # Add container to ISO
 make build/deploy.iso $@
-
-mv build/deploy.iso build/${ISO_NAME}.iso