diff --git a/.drone.jsonnet b/.drone.jsonnet
index ff08eea..de67cbe 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -31,7 +31,7 @@ local PipelineDeployment(scenario='centos7') = {
   },
   workspace: {
     base: '/drone/src',
-    path: 'xoxys.bitwarden_rs',
+    path: 'xoxys.bitwardenrs_docker',
   },
   steps: [
     {
@@ -80,7 +80,7 @@ local PipelineDocumentation = {
       name: 'publish',
       image: 'plugins/gh-pages:latest',
       settings: {
-        remote_url: "https://gitea.rknet.org/ansible/xoxys.bitwarden_rs",
+        remote_url: "https://gitea.rknet.org/ansible/xoxys.bitwardenrs_docker",
         netrc_machine: "gitea.rknet.org",
         username: { from_secret: 'gitea_username' },
         password: { from_secret: 'gitea_token' },
diff --git a/.drone.yml b/.drone.yml
index 3870160..fb18d17 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -31,7 +31,7 @@ concurrency:
 
 workspace:
   base: /drone/src
-  path: xoxys.bitwarden_rs
+  path: xoxys.bitwardenrs_docker
 
 steps:
 - name: ansible-molecule
@@ -79,7 +79,7 @@ steps:
     pages_directory: _docs/
     password:
       from_secret: gitea_token
-    remote_url: https://gitea.rknet.org/ansible/xoxys.bitwarden_rs
+    remote_url: https://gitea.rknet.org/ansible/xoxys.bitwardenrs_docker
     target_branch: docs
     username:
       from_secret: gitea_username
@@ -147,6 +147,6 @@ depends_on:
 
 ---
 kind: signature
-hmac: 8932d9e6f7c92d8843e0f762f7a53b16808c41a7812682023842026d68cb19db
+hmac: 52f5d7f4eaba07c6528e2a60430859d57194cc650d05e9d77e05093dcc67ada1
 
 ...
diff --git a/HEADER.md b/HEADER.md
index bb3a558..f6d5299 100644
--- a/HEADER.md
+++ b/HEADER.md
@@ -1,4 +1,4 @@
-# xoxys.bitwarden_rs
+# xoxys.bitwardenrs_docker
   
-[![Build Status](https://drone.rknet.org/api/badges/ansible/xoxys.bitwarden_rs/status.svg)](https://drone.rknet.org/ansible/xoxys.bitwarden_rs)
+[![Build Status](https://drone.rknet.org/api/badges/ansible/xoxys.bitwardenrs_docker/status.svg)](https://drone.rknet.org/ansible/xoxys.bitwardenrs_docker)
 
diff --git a/README.md b/README.md
index 09387ba..66c11e6 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,11 @@
-# xoxys.bitwarden_rs
+# xoxys.bitwardenrs_docker_docker
   
-[![Build Status](https://drone.rknet.org/api/badges/ansible/xoxys.bitwarden_rs/status.svg)](https://drone.rknet.org/ansible/xoxys.bitwarden_rs)
+[![Build Status](https://drone.rknet.org/api/badges/ansible/xoxys.bitwardenrs_docker/status.svg)](https://drone.rknet.org/ansible/xoxys.bitwardenrs_docker)
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](LICENSE)
 
-Role to setup a [Bitwarden RS](https://github.com/dani-garcia/bitwarden_rs) passsword safe. Bitwarden_RS is a community Bitwarden API server implementation written in Rust. This Role use Docker to setup [Bitwarden](https://gitea.rknet.org/docker/bitwarden_rs) and a [Bitwarden LDAP](https://gitea.rknet.org/docker/bitwarden_rs_ldap) Sync Service (optional).
+Role to setup a [Bitwarden RS](https://github.com/dani-garcia/bitwardenrs) password safe. Bitwarden_RS is a community Bitwarden API server implementation written in Rust. This Role use Docker to setup [Bitwarden](https://gitea.rknet.org/docker/bitwardenrs) and a [Bitwarden LDAP](https://gitea.rknet.org/docker/bitwardenrs_ldap) Sync Service (optional).
 
-You can find the full documentation at [galaxy.geekdocs.de](https://galaxy.geekdocs.de/role/bitwarden_rs).
+You can find the full documentation at [galaxy.geekdocs.de](https://galaxy.geekdocs.de/role/bitwardenrs).
 
 ### License
 
diff --git a/defaults/main.yml b/defaults/main.yml
index 78e4bfe..e6ee0f8 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -3,7 +3,7 @@ bitwardenrs_version: latest
 bitwardenrs_service_directory: /var/lib/docker/services/bitwardenrs
 
 bitwardenrs_container_name: bitwardenrs
-bitwardenrs_image: "xoxys/bitwardenrs:{{ bitwardenrs_version }}"
+bitwardenrs_image: "xoxys.bitwardenrs_docker:{{ bitwardenrs_version }}"
 bitwardenrs_restart_policy: on-failure
 bitwardenrs_exposed_port: 80
 bitwardenrs_exposed_ip: 127.0.0.1
@@ -75,7 +75,7 @@ bitwardenrs_authenticator_disable_time_drift: False
 
 # @var bitwardenrs_smtp_host: $ "_unset_"
 bitwardenrs_smtp_from: "bitwardenrs@localhost"
-bitwardenrs_smtp_from_name: "bitwarden_rs"
+bitwardenrs_smtp_from_name: "bitwardenrs"
 bitwardenrs_smtp_port: 587
 bitwardenrs_smtp_ssl: True
 # @var bitwardenrs_smtp_username: $ "_unset_"
@@ -97,7 +97,7 @@ bitwardenrs_db_ssl_rootcert: /etc/ssl/certs/ca-certificates.crt
 bitwardenrs_ldap_sync_enabled: False
 bitwardenrs_ldap_container_name: bitwardenrs_ldap
 bitwardenrs_ldap_version: latest
-bitwardenrs_ldap_image: "xoxys/bitwardenrs_ldap:{{ bitwardenrs_ldap_version }}"
+bitwardenrs_ldap_image: "xoxys.bitwardenrs_docker_ldap:{{ bitwardenrs_ldap_version }}"
 bitwardenrs_ldap_restart_policy: on-failure
 # @var bitwardenrs_ldap_volumes_extra:example: >
 # bitwardenrs_ldap_volumes_extra:
diff --git a/meta/main.yml b/meta/main.yml
index 26ac96e..f2e2a79 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -4,13 +4,13 @@ galaxy_info:
 # @meta author:value: [xoxys](https://gitea.rknet.org/xoxys)
   author: xoxys <mail@geeklabor.de>
 # @meta description: >
-# [![Build Status](https://drone.rknet.org/api/badges/ansible/xoxys.bitwarden_rs/status.svg)](https://drone.rknet.org/ansible/xoxys.bitwarden_rs)
+# [![Build Status](https://drone.rknet.org/api/badges/ansible/xoxys.bitwardenrs_docker/status.svg)](https://drone.rknet.org/ansible/xoxys.bitwardenrs_docker)
 # [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](LICENSE)
 #
-# Role to setup a [Bitwarden RS](https://github.com/dani-garcia/bitwarden_rs) passsword safe.
+# Role to setup a [Bitwarden RS](https://github.com/dani-garcia/bitwardenrs) passsword safe.
 # Bitwarden_RS is a community Bitwarden API server implementation written in Rust. This Role
-# use Docker to setup [Bitwarden](https://gitea.rknet.org/docker/bitwarden_rs) and a
-# [Bitwarden LDAP](https://gitea.rknet.org/docker/bitwarden_rs_ldap) Sync Service (optional).
+# use Docker to setup [Bitwarden](https://gitea.rknet.org/docker/bitwardenrs) and a
+# [Bitwarden LDAP](https://gitea.rknet.org/docker/bitwardenrs_ldap) Sync Service (optional).
 # @end
   description: Role to setup Bitwarden passsword safe
   license: MIT
diff --git a/molecule/centos7/playbook.yml b/molecule/centos7/playbook.yml
index 6a5a901..64c1594 100644
--- a/molecule/centos7/playbook.yml
+++ b/molecule/centos7/playbook.yml
@@ -30,4 +30,4 @@
 
   roles:
     - role: xoxys.postgres
-    - role: xoxys.bitwarden_rs
+    - role: xoxys.bitwardenrs_docker
diff --git a/molecule/centos7/tests/test_default.py b/molecule/centos7/tests/test_default.py
index 94ddd22..076c17c 100644
--- a/molecule/centos7/tests/test_default.py
+++ b/molecule/centos7/tests/test_default.py
@@ -9,18 +9,18 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
     os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
 
 
-def test_bitwarden_rs_running(host):
-    bitwarden_rs = host.docker("bitwardenrs")
+def test_bitwardenrs_running(host):
+    bitwardenrs = host.docker("bitwardenrs")
 
-    assert bitwarden_rs.is_running
+    assert bitwardenrs.is_running
 
 
-def test_bitwarden_rs_socket(host):
+def test_bitwardenrs_socket(host):
     # Verify the socket is listening for HTTP traffic
     assert host.socket("tcp://127.0.0.1:80").is_listening
 
 
-def test_bitwarden_rs_conn_error(host):
+def test_bitwardenrs_conn_error(host):
     code = int(host.run("curl -s -w '%{http_code}' http://localhost/alive -o /dev/null").stdout)
     body = host.run("curl -sX GET http://localhost/").stdout