diff --git a/scripts/deploy/310-openstack-services-extended.sh b/scripts/deploy/310-openstack-services-extended.sh
index 2c5ab9a59..bd6436cb6 100755
--- a/scripts/deploy/310-openstack-services-extended.sh
+++ b/scripts/deploy/310-openstack-services-extended.sh
@@ -24,3 +24,6 @@ fi
 # if [[ $MANAGER_VERSION =~ ^7\.[0-9]\.[0-9]?$ || $MANAGER_VERSION == "latest" ]]; then
 #     osism apply senlin
 # fi
+
+osism apply aodh
+osism apply manila
diff --git a/scripts/deploy/330-openstack-services-additional.sh b/scripts/deploy/330-openstack-services-additional.sh
deleted file mode 100755
index bbcf54dc1..000000000
--- a/scripts/deploy/330-openstack-services-additional.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-source /opt/configuration/scripts/include.sh
-
-osism apply aodh
-osism apply manila
diff --git a/scripts/upgrade/310-openstack-services-extended.sh b/scripts/upgrade/310-openstack-services-extended.sh
index 0cc84f731..c3f22f678 100755
--- a/scripts/upgrade/310-openstack-services-extended.sh
+++ b/scripts/upgrade/310-openstack-services-extended.sh
@@ -20,3 +20,6 @@ fi
 # if [[ $MANAGER_VERSION =~ ^7\.[0-9]\.[0-9]?$ || $MANAGER_VERSION == "latest" ]]; then
 #     osism apply -a upgrade senlin
 # fi
+
+osism apply -a upgrade aodh
+osism apply -a upgrade manila
diff --git a/scripts/upgrade/330-openstack-services-additional.sh b/scripts/upgrade/330-openstack-services-additional.sh
deleted file mode 100755
index f9b5e7ea3..000000000
--- a/scripts/upgrade/330-openstack-services-additional.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-source /opt/configuration/scripts/include.sh
-
-osism apply -a upgrade aodh
-osism apply -a upgrade manila