diff --git a/roles/tx_submit_api/defaults/main.yml b/roles/tx_submit_api/defaults/main.yml
index f9679ca..a440332 100644
--- a/roles/tx_submit_api/defaults/main.yml
+++ b/roles/tx_submit_api/defaults/main.yml
@@ -20,7 +20,7 @@ cardano_node_group: root
 tx_submit_api_docker_image: 'ghcr.io/blinklabs-io/tx-submit-api:{{ tx_submit_api_version }}'
 
 # Docker container name
-tx_submit_api_docker_container_name: cardano-submit-api
+tx_submit_api_docker_container_name: tx-submit-api
 
 # Port for host/container
 tx_submit_api_container_port: 8090
diff --git a/roles/tx_submit_api/tasks/docker.yml b/roles/tx_submit_api/tasks/docker.yml
index 0b7b451..c4a0d42 100644
--- a/roles/tx_submit_api/tasks/docker.yml
+++ b/roles/tx_submit_api/tasks/docker.yml
@@ -1,13 +1,13 @@
 ---
 - name: Create container
   docker_container:
-    name: '{{ cardano_submit_api_docker_container_name }}'
-    image: '{{ cardano_submit_api_docker_image }}'
+    name: '{{ tx_submit_api_docker_container_name }}'
+    image: '{{ tx_submit_api_docker_image }}'
     restart_policy: unless-stopped
     ports:
-      - '{{ cardano_submit_api_port }}:{{ cardano_submit_api_container_port }}'
-      - '{{ cardano_submit_api_metrics_port }}:{{ cardano_submit_api_metrics_container_port }}'
+      - '{{ tx_submit_api_port }}:{{ tx_submit_api_container_port }}'
+      - '{{ tx_submit_api_metrics_port }}:{{ tx_submit_api_metrics_container_port }}'
     env:
-      CARDANO_NETWORK: '{{ cardano_submit_api_network }}'
+      CARDANO_NETWORK: '{{ tx_submit_api_network }}'
     volumes:
-      - '{{ cardano_node_ipc_dir }}:{{ cardano_submit_api_ipc_container_dir }}'
+      - '{{ cardano_node_ipc_dir }}:{{ tx_submit_api_ipc_container_dir }}'
diff --git a/roles/tx_submit_api/tasks/main.yml b/roles/tx_submit_api/tasks/main.yml
index 6b8898d..5d653ee 100644
--- a/roles/tx_submit_api/tasks/main.yml
+++ b/roles/tx_submit_api/tasks/main.yml
@@ -4,8 +4,8 @@
     _allowed_install_methods: ['docker']
   ansible.builtin.assert:
     that:
-      - cardano_submit_api_install_method in _allowed_install_methods
-    fail_msg: 'The specified install method ({{ cardano_submit_api_install_method }}) is not one of the allowed values ({{ _allowed_install_methods | join(", ") }})'
+      - tx_submit_api_install_method in _allowed_install_methods
+    fail_msg: 'The specified install method ({{ tx_submit_api_install_method }}) is not one of the allowed values ({{ _allowed_install_methods | join(", ") }})'
 
 # We use the node owner and group
 - name: Create directories
@@ -16,9 +16,8 @@
     group: '{{ cardano_node_group }}'
     mode: '0755'
   loop:
-    - '{{ cardano_node_dir }}'
     - '{{ cardano_node_ipc_dir }}'
 
 - name: Include docker-related tasks
   ansible.builtin.include_tasks: docker.yml
-  when: cardano_submit_api_install_method == 'docker'
+  when: tx_submit_api_install_method == 'docker'