diff --git a/deploy/scalewayDeploy.js b/deploy/scalewayDeploy.js
index 94a47af..8a878b0 100644
--- a/deploy/scalewayDeploy.js
+++ b/deploy/scalewayDeploy.js
@@ -77,9 +77,9 @@ class ScalewayDeploy {
       "deploy:deploy": () =>
         BbPromise.bind(this)
           .then(this.createServerlessNamespace)
+          .then(this.updateServerlessNamespace)
           .then(chainContainers)
           .then(chainFunctions)
-          .then(this.updateServerlessNamespace)
           .then(this.deployTriggers),
     };
   }
diff --git a/shared/setUpDeployment.js b/shared/setUpDeployment.js
index a6df7a2..d9ae189 100644
--- a/shared/setUpDeployment.js
+++ b/shared/setUpDeployment.js
@@ -3,8 +3,8 @@ module.exports = {
     const { service } = this.provider.serverless;
     const { provider } = service;
     this.namespaceName = service.service;
-    this.namespaceVariables = provider.env || {};
-    this.namespaceSecretVariables = provider.secret || {};
+    this.namespaceVariables = provider.env;
+    this.namespaceSecretVariables = provider.secret;
     this.runtime = provider.runtime;
 
     const defaultTokenExpirationDate = new Date();