diff --git a/.drone.jsonnet b/.drone.jsonnet
index 0354ed4..8864928 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -71,23 +71,24 @@ local gen_release() =
    type: 'docker',
    image: 'guisea/ansible-molecule:alpine-latest',
    name: 'Generate Release',
+   environment:
+   { USER: { from_secret: 'GITEA_USER' },
+     TOKEN: { from_secret: 'GITEA_TOKEN' },
+     REPOUSER: { from_secret: 'GITEA_REPOUSER'},
+     URL: { from_secret: 'GITEA_URL' },
+   },
    commands: [
       'sleep 10', // give docker enough time to start
       'env',
       'mkdir ${DRONE_REPO_NAME}',
       'rsync -a . ${DRONE_REPO_NAME} --exclude ${DRONE_REPO_NAME}',
       'cd ${DRONE_REPO_NAME}',
-      'echo GITEA_USER=${USER}',
+      'echo GITEA_USER=$USER',
       'apk update && apk add --no-cache curl',
       'tar -czf ../${DRONE_REPO_NAME}.${DRONE_TAG}.tar.gz ./*', // Create an archive of the role
       'curl --user $${USER}:$${TOKEN} --upload-file ../${DRONE_REPO_NAME}.${DRONE_TAG}.tar.gz https://$${URL}/api/packages/$${REPOUSER}/generic/ansible-role-common/${DRONE_TAG}/${DRONE_REPO_NAME}.${DRONE_TAG}.tar.gz',
    ],
-   environment:
-     { USER: { from_secret: 'GITEA_USER' },
-       TOKEN: { from_secret: 'GITEA_TOKEN' },
-       REPOUSER: { from_secret: 'GITEA_REPOUSER'},
-       URL: { from_secret: 'GITEA_URL' },
-     },
+
    when:
    { event: {include: ['tag']},  
    },