diff --git a/Jenkinsfile b/Jenkinsfile
index d097a73..8429968 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -33,35 +33,34 @@ spec:
 
     stages {
         stage('Grab Code') {
-            container('hugo')
             steps {
+                container('hugo')
                 checkout scm
             }
         }
 
         stage('Test Hugo syntax') {
-            container('hugo')
             steps {
+                container('hugo')
                 sh 'hugo --quiet'
             }
         }
 
         stage('Build the Site') {
-            container('hugo')
             steps {
+                container('hugo')
                 sh 'hugo'
             }
         }
 
         stage('Create Package') {
-            container('hugo')
             steps {
+                container('hugo')
                 sh "tar zcvf site.tar.gz ./public/"
             }
         }
 
         stage('Upload Release') {
-            container('tea')
             environment {
                 GITEA_LOGIN = 'js-hellug-bot'
                 GITEA_SERVER_URL = 'https://dev.hellug.gr'
@@ -69,6 +68,7 @@ spec:
             }
 
             steps {
+                container('tea')
                 sh 'go get code.gitea.io/tea && go install code.gitea.io/tea'
                 sh "tea login add -n ${GITEA_LOGIN}"
                 sh 'tea r create -t ${BUILD_TAG} --tag ${BUILD_NUMBER} -a site.tar.gz'