diff --git a/charts/tibiadata-api-go/Chart.yaml b/charts/tibiadata-api-go/Chart.yaml
index b034179..f9f3523 100644
--- a/charts/tibiadata-api-go/Chart.yaml
+++ b/charts/tibiadata-api-go/Chart.yaml
@@ -24,7 +24,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.1.3
+version: 1.2.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/tibiadata-api-go/templates/configmaps.yaml b/charts/tibiadata-api-go/templates/configmaps.yaml
new file mode 100644
index 0000000..5fa990b
--- /dev/null
+++ b/charts/tibiadata-api-go/templates/configmaps.yaml
@@ -0,0 +1,12 @@
+{{- if .Values.configMap.create }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "tibiadata-api-go.fullname" . }}
+  labels:
+    {{- include "tibiadata-api-go.labels" . | nindent 4 }}
+data:
+  {{- range $key, $value := .Values.configMap.settings }}
+  {{ $key }}: {{ $value | quote }}
+  {{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/charts/tibiadata-api-go/templates/deployment.yaml b/charts/tibiadata-api-go/templates/deployment.yaml
index f124dd5..a757f58 100644
--- a/charts/tibiadata-api-go/templates/deployment.yaml
+++ b/charts/tibiadata-api-go/templates/deployment.yaml
@@ -49,6 +49,9 @@ spec:
             {{- toYaml .Values.resources | nindent 12 }}
           env:
             {{- toYaml .Values.env | nindent 12 }}
+          envFrom:
+            - configMapRef:
+                name: {{ include "tibiadata-api-go.fullname" . }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
diff --git a/charts/tibiadata-api-go/values.yaml b/charts/tibiadata-api-go/values.yaml
index 5174511..f5158c6 100644
--- a/charts/tibiadata-api-go/values.yaml
+++ b/charts/tibiadata-api-go/values.yaml
@@ -24,6 +24,19 @@ serviceAccount:
   # If not set and create is true, a name is generated using the fullname template
   name: ""
 
+configMap:
+  create: true
+  settings:
+    # generic settings
+    debug_mode: false
+    # Gin-related settings
+    gin_mode: release
+    gin_trusted_proxies: ""
+    # TibiaData-related settings
+    tibiadata_edition: open-source
+    tibiadata_host: undefined
+    tibiadata_restriction_mode: false
+
 podAnnotations: {}
 
 podSecurityContext: