diff --git a/roles/gotosocial/defaults/main.yml b/roles/gotosocial/defaults/main.yml
index b5adf98..d97be5f 100644
--- a/roles/gotosocial/defaults/main.yml
+++ b/roles/gotosocial/defaults/main.yml
@@ -7,11 +7,12 @@ gotosocial_config_path: "{{ gotosocial_base_path }}/config"
 gotosocial_template_path: "{{ gotosocial_base_path }}/templates"
 gotosocial_asset_path: "{{ gotosocial_base_path }}/assets"
 gotosocial_storage_path: "{{ gotosocial_base_path }}/storage"
+gotosocial_cert_path: "{{ gotosocial_base_path }}/certificates"
 gotosocial_config_file: "{{ gotosocial_config_path }}/config.yaml"
 
 gotosocial_config: >-
   {{ gotosocial_default_config
-  | combine(gotosocial_extra_config, recursive=True) }}
+  | combine(gotosocial_extra_config | default({}), recursive=True) }}
 
 gotosocial_config_log_level: info
 gotosocial_config_log_db_queries: false
@@ -108,6 +109,7 @@ gotosocial_container_volumes: >-2
   {{ gotosocial_container_default_volumes
   + gotosocial_container_extra_volumes }}
 gotosocial_container_default_volumes:
+  - "{{ gotosocial_config_file }}:/gotosocial/config.yaml:ro"
   - "{{ gotosocial_storage_path }}:/gotosocial/storage:z"
 gotosocial_container_extra_volumes: []
 
@@ -117,4 +119,11 @@ gotosocial_container_user: "{{ gotosocial_user }}"
 gotosocial_container_etc_hosts: ~
 gotosocial_container_networks: ~
 gotosocial_container_purge_networks: false
-gotosocial_container_restart_policy: unless_stopped
+gotosocial_container_restart_policy: unless-stopped
+gotosocial_container_entrypoint:
+  - "/gotosocial/gotosocial"
+  - "--config-path"
+  - "config.yaml"
+  - "server"
+  - "start"
+
diff --git a/roles/gotosocial/tasks/main.yml b/roles/gotosocial/tasks/main.yml
index 2a3802d..edfe22f 100644
--- a/roles/gotosocial/tasks/main.yml
+++ b/roles/gotosocial/tasks/main.yml
@@ -27,7 +27,7 @@
 
 - name: Ensure configuration is up to date
   copy:
-    content: "{{ gotosocial_config | to_nice_yaml(indent=2, max_with=10000) }}"
+    content: "{{ gotosocial_config | to_nice_yaml(indent=2, width=10000) }}"
     dest: "{{ gotosocial_config_file }}"
     owner: "{{ gotosocial_user_info.uid | default(gotosocial_user) }}"
     group: "{{ gotosocial_user_info.group | default(gotosocial_user) }}"
@@ -36,7 +36,7 @@
 
 - name: Ensure container image is available
   docker_image:
-    image: "{{ gotosocial_container_image }}"
+    name: "{{ gotosocial_container_image }}"
     state: present
     source: pull
     force_source: >-
@@ -54,9 +54,10 @@
     volumes: "{{ gotosocial_container_volumes }}"
     env: "{{ gotosocial_container_env | default(omit, True) }}"
     ports: "{{ gotosocial_container_ports | default(omit, True) }}"
-    labels: "{{ gotosocial_container_labels | default(omit, True }}"
+    labels: "{{ gotosocial_container_labels | default(omit, True) }}"
     networks: "{{ gotosocial_container_networks | default(omit, True) }}"
     etc_hosts: "{{ gotosocial_container_etc_hosts | default(omit, True) }}"
     purge_networks: "{{ gotosocial_container_purge_networks | default(False, True) }}"
     restart_policy: "{{ gotosocial_container_restart_policy }}"
+    entrypoint: "{{ gotosocial_container_entrypoint }}"
     state: started
diff --git a/roles/gotosocial/vars.yml b/roles/gotosocial/vars/main.yml
similarity index 98%
rename from roles/gotosocial/vars.yml
rename to roles/gotosocial/vars/main.yml
index 45fa474..72517ba 100644
--- a/roles/gotosocial/vars.yml
+++ b/roles/gotosocial/vars/main.yml
@@ -11,6 +11,7 @@ gotosocial_default_config:
   port: "{{ gotosocial_config_port }}"
   trusted-proxies: "{{ gotosocial_config_trusted_proxies }}"
   db-type: "{{ gotosocial_config_db_type }}"
+  db-address: "{{ gotosocial_config_db_address }}"
   db-port: "{{ gotosocial_config_db_port }}"
   db-user: "{{ gotosocial_config_db_user }}"
   db-password: "{{ gotosocial_config_db_password }}"