diff --git a/gateway/initial_gw_setup.yml b/gateway/initial_gw_setup.yml
index c8375b4c0ad97bf1fcfce8eedfb970f068cd6578..b8855e35b6d3a638dee81ec5813469c766c8ba6c 100644
--- a/gateway/initial_gw_setup.yml
+++ b/gateway/initial_gw_setup.yml
@@ -230,22 +230,30 @@
         path: /etc/openvpn/server
         state: absent
       tags: config
-    - name: Copy hideme config
+    - name: Copy VPN config
       ansible.builtin.copy:
-        src: "{{ server_config_dir }}/openvpn/hideme.conf"
-        dest: /etc/openvpn/hideme.conf
+        src: "{{ server_config_dir }}/openvpn/mullvad.conf"
+        dest: /etc/openvpn/mullvad.conf
         owner: root
         group: root
         mode: "0644"
       tags: config
-    - name: Copy hideme auth file
+    - name: Copy VPN auth file
       ansible.builtin.copy:
-        src: "{{ server_config_dir }}/openvpn/auth.txt"
-        dest: /etc/openvpn/auth.txt
+        src: "{{ server_config_dir }}/openvpn/mullvad_userpass.txt"
+        dest: /etc/openvpn/mullvad_userpass.txt
         owner: root
         group: root
         mode: "0640"
       tags: config
+    - name: Copy VPN CA file
+      ansible.builtin.copy:
+        src: "{{ server_config_dir }}/openvpn/mullvad_ca.crt"
+        dest: /etc/openvpn/mullvad_ca.crt
+        owner: root
+        group: root
+        mode: "0644"
+      tags: config
     - name: Copy hideme-up script
       ansible.builtin.copy:
         src: "{{ server_scripts_dir }}/hideme-up"
@@ -272,7 +280,7 @@
       tags: config
     - name: Ensure OpenVPN sevice is enabled + starts
       ansible.builtin.service:
-        name: "openvpn@hideme"
+        name: "openvpn@mullvad"
         state: "started"
         enabled: true
       tags: config