diff --git a/roles/repository/tasks/main.yml b/roles/repository/tasks/main.yml
index fe3335ba6..fd8988741 100644
--- a/roles/repository/tasks/main.yml
+++ b/roles/repository/tasks/main.yml
@@ -218,14 +218,19 @@
         | default(None), list_merge='prepend')
         | dict2items }}
 
-    - name: Create apply_amps.sh
+    - name: Prepare apply_amps.sh
       ansible.builtin.template:
         owner: "{{ username }}"
         group: "{{ group_name }}"
-        src: apply_amps.sh
-        dest: "{{ repository_content_folder }}"
+        src: apply_amps.sh.j2
+        dest: "{{ repository_content_folder }}/bin/apply_amps.sh"
         mode: "0755"
 
+    - name: Remove deprecated apply_amps.sh
+      ansible.builtin.file:
+        path: "{{ repository_content_folder }}/apply_amps.sh"
+        state: absent
+
     - name: Install ACS data files to Linux FHS destinations
       block:
         - name: Copy Alfresco data files
@@ -436,7 +441,7 @@
 - name: Install amps on alfresco and share war files
   become: true
   ansible.builtin.command:
-    cmd: "{{ repository_content_folder }}/apply_amps.sh -nobackup -force"
+    cmd: "{{ repository_content_folder }}/bin/apply_amps.sh -nobackup -force"
   register: mmt_install
   changed_when: true
   tags:
diff --git a/roles/repository/templates/apply_amps.sh b/roles/repository/templates/apply_amps.sh
deleted file mode 100644
index 37cb48339..000000000
--- a/roles/repository/templates/apply_amps.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-. {{ config_folder }}/setenv.sh
-
-echo "Installing Content Services Platform AMPs ..."
-sudo ${JAVA_HOME}/bin/java -jar ${ACS_HOME}/bin/alfresco-mmt.jar install {{ binaries_folder }}/modules/acs-platform ${ACS_HOME}/web-server/webapps/alfresco.war -directory $*
-sudo ${JAVA_HOME}/bin/java -jar ${ACS_HOME}/bin/alfresco-mmt.jar install ${ACS_HOME}/amps_repo ${ACS_HOME}/web-server/webapps/alfresco.war -directory -nobackup $*
-sudo ${JAVA_HOME}/bin/java -jar ${ACS_HOME}/bin/alfresco-mmt.jar list ${ACS_HOME}/web-server/webapps/alfresco.war
-
-echo "Installing Content Services Share AMPs ..."
-sudo ${JAVA_HOME}/bin/java -jar ${ACS_HOME}/bin/alfresco-mmt.jar install {{ binaries_folder }}/modules/acs-share ${ACS_HOME}/web-server/webapps/share.war -directory $*
-if [ -d ${ACS_HOME}/amps_share ]; then
-    sudo ${JAVA_HOME}/bin/java -jar ${ACS_HOME}/bin/alfresco-mmt.jar install ${ACS_HOME}/amps_share ${ACS_HOME}/web-server/webapps/share.war -directory -nobackup $*
-fi
-sudo ${JAVA_HOME}/bin/java -jar ${ACS_HOME}/bin/alfresco-mmt.jar list ${ACS_HOME}/web-server/webapps/share.war
-
-echo "Clearing Tomcat Application Cache ..."
-sudo rm -rf ${ACS_HOME}/web-server/webapps/alfresco
-sudo rm -rf ${ACS_HOME}/web-server/webapps/share
diff --git a/roles/repository/templates/apply_amps.sh.j2 b/roles/repository/templates/apply_amps.sh.j2
new file mode 100644
index 000000000..3e9d7e4a1
--- /dev/null
+++ b/roles/repository/templates/apply_amps.sh.j2
@@ -0,0 +1,20 @@
+#!/bin/sh
+. {{ config_folder }}/setenv.sh
+
+if [ -d ${ACS_HOME}/amps_repo ]; then
+  echo "Installing Content Services Platform AMPs ..."
+  ${JAVA_HOME}/bin/java -jar ${ACS_HOME}/bin/alfresco-mmt.jar install ${ACS_HOME}/amps_repo ${ACS_HOME}/web-server/webapps/alfresco.war -directory -nobackup $*
+fi
+echo "Listing Content Services Platform AMPs ..."
+${JAVA_HOME}/bin/java -jar ${ACS_HOME}/bin/alfresco-mmt.jar list ${ACS_HOME}/web-server/webapps/alfresco.war
+
+if [ -d ${ACS_HOME}/amps_share ]; then
+  echo "Installing Content Services Share AMPs ..."
+  ${JAVA_HOME}/bin/java -jar ${ACS_HOME}/bin/alfresco-mmt.jar install ${ACS_HOME}/amps_share ${ACS_HOME}/web-server/webapps/share.war -directory -nobackup $*
+fi
+echo "Listing Content Services Share AMPs ..."
+${JAVA_HOME}/bin/java -jar ${ACS_HOME}/bin/alfresco-mmt.jar list ${ACS_HOME}/web-server/webapps/share.war
+
+echo "Clearing Tomcat Application Cache ..."
+rm -rf ${ACS_HOME}/web-server/webapps/alfresco
+rm -rf ${ACS_HOME}/web-server/webapps/share