diff --git a/Jenkinsfile b/Jenkinsfile
index 282b876..cea7355 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -37,28 +37,30 @@ pipeline {
             when { tag "*" }
             agent any
             steps {
-                def architectures = env.ARCHITECTURES.split(',')
+                script {
+                    def architectures = env.ARCHITECTURES.split(',')
 
-                for (arch in architectures) {
-                    unstash "${arch}-image"
-                    sh "podman load -i ${arch}-${env.BUILD_NUMBER}.tar"
-                }
+                    for (arch in architectures) {
+                        unstash "${arch}-image"
+                        sh "podman load -i ${arch}-${env.BUILD_NUMBER}.tar"
+                    }
 
-                def manifestImages = architectures.collect { arch ->
-                        return "${CONTAINER_REGISTRY}/${REGISTRY_NAMESPACE}/${REPO_NAME}:${env.BRANCH_NAME}-${arch}-${env.BUILD_NUMBER}"
-                    }.join(' ')
+                    def manifestImages = architectures.collect { arch ->
+                            return "${CONTAINER_REGISTRY}/${REGISTRY_NAMESPACE}/${REPO_NAME}:${env.BRANCH_NAME}-${arch}-${env.BUILD_NUMBER}"
+                        }.join(' ')
 
-                sh '''
-                    podman manifest rm ${CONTAINER_REGISTRY}/${REGISTRY_NAMESPACE}/${REPO_NAME}:${BRANCH_NAME} || true
-                    podman manifest create ${CONTAINER_REGISTRY}/${REGISTRY_NAMESPACE}/${REPO_NAME}:${BRANCH_NAME} ${manifestImages}
-                '''
-
-                withCredentials([usernamePassword(credentialsId: "dockerhub", usernameVariable: "REG_USERNAME", passwordVariable: "REG_PASSWORD")]) {
                     sh '''
-                        podman login ${CONTAINER_REGISTRY} -u ${REG_USERNAME} -p ${REG_PASSWORD}
-                        podman manifest push ${CONTAINER_REGISTRY}/${REGISTRY_NAMESPACE}/${REPO_NAME}:${BRANCH_NAME} \
-                            docker://${CONTAINER_REGISTRY}/${REGISTRY_NAMESPACE}/${REPO_NAME}:${BRANCH_NAME}
+                        podman manifest rm ${CONTAINER_REGISTRY}/${REGISTRY_NAMESPACE}/${REPO_NAME}:${BRANCH_NAME} || true
+                        podman manifest create ${CONTAINER_REGISTRY}/${REGISTRY_NAMESPACE}/${REPO_NAME}:${BRANCH_NAME} ${manifestImages}
                     '''
+
+                    withCredentials([usernamePassword(credentialsId: "dockerhub", usernameVariable: "REG_USERNAME", passwordVariable: "REG_PASSWORD")]) {
+                        sh '''
+                            podman login ${CONTAINER_REGISTRY} -u ${REG_USERNAME} -p ${REG_PASSWORD}
+                            podman manifest push ${CONTAINER_REGISTRY}/${REGISTRY_NAMESPACE}/${REPO_NAME}:${BRANCH_NAME} \
+                                docker://${CONTAINER_REGISTRY}/${REGISTRY_NAMESPACE}/${REPO_NAME}:${BRANCH_NAME}
+                        '''
+                    }
                 }
             }
         }