diff --git a/tutor/templates/k8s/configmap.yml b/tutor/templates/k8s/configmap.yml
new file mode 100644
index 0000000000000000000000000000000000000000..53c180edbd57cb98ada0d6e7c6dd29e6cae87e7a
--- /dev/null
+++ b/tutor/templates/k8s/configmap.yml
@@ -0,0 +1,8 @@
+apiVersion: v1
+data:
+  my.cnf: "[mysqld]\npid-file\t= /var/run/mysqld/mysqld.pid\nsocket\t\t= /var/run/mysqld/mysqld.sock\ndatadir\t\t=
+    /var/lib/mysql\nlog-error\t= /var/log/mysql/error.log\n# Disabling symbolic-links
+    is recommended to prevent assorted security risks\nsymbolic-links=0\nskip-host-cache\nskip-name-resolve\ncharacter-set-server=utf8\ncollation-server=utf8_general_ci\n"
+kind: ConfigMap
+metadata:
+  name: mysql-cnf
diff --git a/tutor/templates/k8s/deployments.yml b/tutor/templates/k8s/deployments.yml
index a9f96002dbced05ca6c3c610da1c9d736aa642e5..2e14e359dba2a859a15eecbfe684d17e82aa7919 100644
--- a/tutor/templates/k8s/deployments.yml
+++ b/tutor/templates/k8s/deployments.yml
@@ -325,7 +325,6 @@ spec:
         - name: mysql
           imagePullPolicy: Always
           image: {{ DOCKER_REGISTRY }}{{ DOCKER_IMAGE_MYSQL }}
-          args: ["mysqld", "--character-set-server=utf8", "--collation-server=utf8_general_ci"]
           env:
             - name: MYSQL_ROOT_PASSWORD
               valueFrom:
@@ -343,10 +342,15 @@ spec:
           volumeMounts:
             - mountPath: /var/lib/mysql
               name: data
+            - mountPath: /etc/mysql
+              name: mysql-cnf
       volumes:
         - name: data
           persistentVolumeClaim:
             claimName: mysql
+        - name: mysql-cnf
+          configMap:
+            name: mysql-cnf
 {% endif %}
 {% if ACTIVATE_SMTP %}
 ---
diff --git a/tutor/templates/k8s/jobs.yml b/tutor/templates/k8s/jobs.yml
index 2cf4d31f132013754dcf749c666da72a38429881..b51c841a0086b5cc71cbb98b683fbbfdf70d3057 100644
--- a/tutor/templates/k8s/jobs.yml
+++ b/tutor/templates/k8s/jobs.yml
@@ -68,22 +68,6 @@ spec:
 ---
 apiVersion: batch/v1
 kind: Job
-metadata:
-  name: mysql-job
-  labels:
-    app.kubernetes.io/component: job
-spec:
-  template:
-    spec:
-      restartPolicy: Never
-      containers:
-      - name: mysql
-        imagePullPolicy: Always
-        image: {{ DOCKER_REGISTRY }}{{ DOCKER_IMAGE_MYSQL }}
-        command: []
----
-apiVersion: batch/v1
-kind: Job
 metadata:
   name: forum-job
   labels:
diff --git a/tutor/templates/kustomization.yml b/tutor/templates/kustomization.yml
index 5434e04f756b796ee292f0e423dcc259aae2fc6c..0743d840cb242ecde0d6a66fee193dbf4bbc981e 100644
--- a/tutor/templates/kustomization.yml
+++ b/tutor/templates/kustomization.yml
@@ -3,6 +3,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
 - k8s/namespace.yml
+- k8s/configmap.yml
 - k8s/deployments.yml
 - k8s/ingress.yml
 - k8s/jobs.yml
@@ -39,4 +40,4 @@ configMapGenerator:
   env: apps/mysql/auth.env
 {{ patch("kustomization-configmapgenerator") }}
 
-{{ patch("kustomization") }}
\ No newline at end of file
+{{ patch("kustomization") }}