diff --git a/nas.yml b/nas.yml
index 2e56b53a39..fe122ae9e9 100644
--- a/nas.yml
+++ b/nas.yml
@@ -11,7 +11,7 @@
         - ansible-nas-users
         - ansible-nas
 
-    - role: bertvv.samba
+    - role: vladgh.samba.server
       tags:
         - samba
         - skip_ansible_lint
diff --git a/requirements.yml b/requirements.yml
index dcd6df6bde..d6a3eb5252 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -3,12 +3,6 @@ roles:
   - name: geerlingguy.docker
     version: 7.1.0
 
-  - name: geerlingguy.docker_arm
-    version: 5.0.0
-
-  - name: bertvv.samba
-    version: v2.7.1
-
   - name: geerlingguy.nfs
     version: 2.0.0
 
@@ -23,3 +17,4 @@ collections:
   - name: community.docker
   - name: community.general
   - name: community.windows
+  - name: vladgh.samba
diff --git a/roles/mealie/tasks/main.yml b/roles/mealie/tasks/main.yml
index 9e76e59ce3..50b524aa7f 100644
--- a/roles/mealie/tasks/main.yml
+++ b/roles/mealie/tasks/main.yml
@@ -16,7 +16,7 @@
         volumes:
           - "{{ mealie_data_directory }}:/app/data:rw"
         ports:
-          - "{{ mealie_port }}:80"
+          - "{{ mealie_port }}:9000"
         env:
           TZ: "{{ ansible_nas_timezone }}"
           PUID: "{{ mealie_user_id }}"
@@ -36,7 +36,7 @@
           traefik.http.routers.mealie.tls.certresolver: "letsencrypt"
           traefik.http.routers.mealie.tls.domains[0].main: "{{ ansible_nas_domain }}"
           traefik.http.routers.mealie.tls.domains[0].sans: "*.{{ ansible_nas_domain }}"
-          traefik.http.services.mealie.loadbalancer.server.port: "80"
+          traefik.http.services.mealie.loadbalancer.server.port: "9000"
   when: mealie_enabled is true
 
 - name: Stop Mealie
diff --git a/website/docs/further-configuration/samba-shares.md b/website/docs/further-configuration/samba-shares.md
index 5dab268c47..b2352ca2ef 100644
--- a/website/docs/further-configuration/samba-shares.md
+++ b/website/docs/further-configuration/samba-shares.md
@@ -1,6 +1,6 @@
 # Samba Shares
 
-Ansible-NAS uses the awesome [bertvv.samba](https://github.com/bertvv/ansible-role-samba) Ansible role to configure Samba - check out the project page for the many different options you can use to configure a share.
+Ansible-NAS uses the awesome [vladgh.samba](https://github.com/vladgh/ansible-collection-vladgh-samba) Ansible role to configure Samba - check out [the Ansible Galaxy page](https://galaxy.ansible.com/vladgh/samba) for the many different options you can use to configure a share.
 
 ## Share Examples