diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 17216cf..10015aa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 variables:
-  HELM_CHART_VERSION: "0.8.6"
+  HELM_CHART_VERSION: "0.8.7"
 
 stages:
   - deploy
diff --git a/Chart/Chart.yaml b/Chart/Chart.yaml
index 1162959..0d7ae6e 100644
--- a/Chart/Chart.yaml
+++ b/Chart/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: cloudypress
 description: Helm chart to deploy Wordpress backed by PHP-CLI and Nginx Unit
 type: application
-version: "0.8.6"
+version: "0.8.7"
 appVersion: "6.2.0"
diff --git a/Chart/templates/configmap.yaml b/Chart/templates/configmap.yaml
index 7e6933c..8ed6d5b 100644
--- a/Chart/templates/configmap.yaml
+++ b/Chart/templates/configmap.yaml
@@ -39,7 +39,9 @@ data:
     RUN_COMPOSER: 'true'
     INSTALL_SITE: {{ .Values.site.init.composerPackage }}
     SET_THEME: {{ .Values.site.init.themeName | default "" }}
-    FORCE_THEME_NAME: {{ .Values.site.forceThemeName | default "" }}
+    {{- if .Values.site.forceThemeName }}
+    FORCE_THEME_NAME: {{ .Values.site.forceThemeName }}
+    {{- end }}
     {{- end }}
     
     {{- if and .Values.site.init  .Values.site.init.content .Values.site.init.content.import }}