diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6da592a30a5bce5383f63157c1509e2086b36933..e1e4f5dcb916dcad782183af538c311d9c28ee70 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -92,6 +92,10 @@ build helm chart:
   script:
     - helm package -u ops/kubernetes/nomad -d ops/kubernetes
     - 'curl --request POST --user gitlab-ci-token:$CI_JOB_TOKEN --form "chart=@ops/kubernetes/nomad-1.0.0.tgz" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/helm/api/latest/charts"'
+  rules:
+    - if: $CI_COMMIT_BRANCH == "develop"
+    - when: manual
+      allow_failure: true
 
 python linting:
   stage: test
diff --git a/ops/kubernetes/nomad-prod-test.yaml b/ops/kubernetes/nomad-prod-test.yaml
index e5666d1f468feb6029f3929459fedb19acde5238..4e27996d901d92831672381ccee1f93747ba84ff 100644
--- a/ops/kubernetes/nomad-prod-test.yaml
+++ b/ops/kubernetes/nomad-prod-test.yaml
@@ -20,7 +20,6 @@ nomad:
       north_home: /nomad/test/fs/north/users
       tmp: /nomad/test/fs/tmp
       nomad: /nomad
-      archiveVersionSuffix: v1
 
     mail:
       enabled: false
diff --git a/ops/kubernetes/nomad/templates/configmap.yml b/ops/kubernetes/nomad/templates/configmap.yml
index d3b65620c5c0d789141100f7f8c8e375c076bcad..124bbe0b41bf45f66640ac95207f6644f1b0d7ba 100644
--- a/ops/kubernetes/nomad/templates/configmap.yml
+++ b/ops/kubernetes/nomad/templates/configmap.yml
@@ -132,4 +132,7 @@ data:
     {{ if .Values.nomad.config.normalize }}
     normalize: {{ .Values.nomad.config.normalize | toYaml | nindent 6 }}
     {{ end }}
+    {{ if .Values.nomad.config.oasis }}
+    oasis: {{ .Values.nomad.config.oasis | toYaml | nindent 6 }}
+    {{ end }}
 {{- end }}
\ No newline at end of file