diff --git a/ansible/roles/microservices/files/robocar/car/configmap.yaml b/ansible/roles/microservices/files/robocar/car/configmap.yaml
deleted file mode 100644
index 929157c..0000000
--- a/ansible/roles/microservices/files/robocar/car/configmap.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: robocar-pca9685
-data:
-  ################
-  # STEERING PWM #
-  ################
-  STEERING_LEFT_PWM: "1092"
-  STEERING_RIGHT_PWM: "1986"
-  STEERING_CENTER_PWM: "1583"
-
-  ################
-  # THROTTLE PWM #
-  ################
-  THROTTLE_MIN_PWM: "1092"
-  THROTTLE_MAX_PWM: "1986"
-  THROTTLE_ZERO_PWM: "1583"
diff --git a/ansible/roles/microservices/files/robocar/car/deployments.yaml b/ansible/roles/microservices/files/robocar/car/deployments.yaml
index 549e659..08ecd11 100644
--- a/ansible/roles/microservices/files/robocar/car/deployments.yaml
+++ b/ansible/roles/microservices/files/robocar/car/deployments.yaml
@@ -237,32 +237,32 @@ spec:
             - name: STEERING_LEFT_PWM
               valueFrom:
                 configMapKeyRef:
-                  name: robocar-pca9685
+                  name: robocar-steering-pwm
                   key: STEERING_LEFT_PWM
             - name: STEERING_RIGHT_PWM
               valueFrom:
                 configMapKeyRef:
-                  name: robocar-pca9685
+                  name: robocar-steering-pwm
                   key: STEERING_RIGHT_PWM
             - name: STEERING_CENTER_PWM
               valueFrom:
                 configMapKeyRef:
-                  name: robocar-pca9685
+                  name: robocar-steering-pwm
                   key: STEERING_CENTER_PWM
             - name: THROTTLE_MIN_PWM
               valueFrom:
                 configMapKeyRef:
-                  name: robocar-pca9685
+                  name: robocar-throttle-pwm
                   key: THROTTLE_MIN_PWM
             - name: THROTTLE_MAX_PWM
               valueFrom:
                 configMapKeyRef:
-                  name: robocar-pca9685
+                  name: robocar-throttle-pwm
                   key: THROTTLE_MAX_PWM
             - name: THROTTLE_ZERO_PWM
               valueFrom:
                 configMapKeyRef:
-                  name: robocar-pca9685
+                  name: robocar-throttle-pwm
                   key: THROTTLE_ZERO_PWM
             - name: TZ
               value: "Europe/Paris"
diff --git a/ansible/roles/microservices/files/robocar/car/kustomization.yaml b/ansible/roles/microservices/files/robocar/car/kustomization.yaml
index dbaab7c..7c9e0aa 100644
--- a/ansible/roles/microservices/files/robocar/car/kustomization.yaml
+++ b/ansible/roles/microservices/files/robocar/car/kustomization.yaml
@@ -7,7 +7,6 @@ namespace: robocar
 resources:
   - ../common
   - deployments.yaml
-  - configmap.yaml
 
 images:
   - name: docker.io/cyrilix/robocar-camera
diff --git a/ansible/roles/microservices/files/robocar/common/configmap.yaml b/ansible/roles/microservices/files/robocar/common/configmap.yaml
index 8157979..a619260 100644
--- a/ansible/roles/microservices/files/robocar/common/configmap.yaml
+++ b/ansible/roles/microservices/files/robocar/common/configmap.yaml
@@ -57,7 +57,18 @@ data:
   STEERING_LEFT_PWM: "1002"
   STEERING_RIGHT_PWM: "1985"
   STEERING_CENTER_PWM: "1491"
-
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: robocar-throttle-pwm
+data:
+  ################
+  # THROTTLE PWM #
+  ################
+  THROTTLE_MIN_PWM: "1092"
+  THROTTLE_MAX_PWM: "1986"
+  THROTTLE_ZERO_PWM: "1583"
 ---
 apiVersion: v1
 kind: ConfigMap