diff --git a/14.Dell/1.Dell_openmanage/0_setup.sh b/14.Dell/1.Dell_openmanage/0_setup.sh
new file mode 100755
index 0000000000000000000000000000000000000000..aae8ebd3d57a61b1fa045560bfa44f0da8c5ed7f
--- /dev/null
+++ b/14.Dell/1.Dell_openmanage/0_setup.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+source ../../global-conf.sh
+
+# DELL server - install dell openmanage
+# http://linux.dell.com/repo/community/openmanage/
+if ( ! dpkg -l | grep dmidecode ); then
+	apt-get install -y dmidecode
+fi
+
+if ( dmidecode | grep Dell ); then
+	if ( grep -qa container=lxc /proc/1/environ ); then
+		echo "The system is running in a LXC container, no Dell package will be installed."
+		exit 0
+	fi
+
+	echo 'deb http://linux.dell.com/repo/community/openmanage/930/bionic bionic main' > /etc/apt/sources.list.d/linux.dell.com.sources.list
+	gpg --keyserver pool.sks-keyservers.net --recv-key 1285491434D8786F
+	gpg -a --export 1285491434D8786F | sudo apt-key add -
+
+	apt-get update
+	apt-get install -y srvadmin-all
+
+	# dsm_om_connsvc is the service to start a web interface on https://<ip_address>:1311/
+	# by default, the interface is only available to the root user
+	# sed -i "s@^root@root,admin@" /opt/dell/srvadmin/etc/omarolemap
+	systemctl enable dsm_om_connsvc
+	systemctl start dsm_om_connsvc
+fi
diff --git a/3.New_server_deployment/4.Dell_openmanage/0_setup.sh b/3.New_server_deployment/4.Dell_openmanage/0_setup.sh
deleted file mode 100755
index 9eb47c7ed3c9972b5dcc433aade82e8f685c0ed5..0000000000000000000000000000000000000000
--- a/3.New_server_deployment/4.Dell_openmanage/0_setup.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-source /root/envsetup/global-conf.sh
-
-echo "Dell Open Manage setup is disabled."
-exit 0
-
-# DELL server - install dell openmanage
-if ( ! dpkg -l | grep dmidecode ); then
-	apt-get install -y dmidecode
-fi
-
-if ( dmidecode | grep Dell ); then
-	if ( grep -qa container=lxc /proc/1/environ ); then
-		echo "The system is running in a LXC container, no Dell package will be installed."
-		exit 0
-	fi
-
-	echo 'deb http://linux.dell.com/repo/community/ubuntu xenial openmanage' > /etc/apt/sources.list.d/linux.dell.com.sources.list
-	gpg --keyserver pool.sks-keyservers.net --recv-key 1285491434D8786F
-	gpg -a --export 1285491434D8786F | sudo apt-key add - 
-
-	apt-get update
-	apt-get install -y srvadmin-all
-
-	update-rc.d dsm_om_connsvc defaults
-	echo "@reboot root /usr/sbin/service dsm_om_connsvc start" > /etc/cron.d/dell_openmanage
-
-	sed -i "s@^root@root,admin@" /opt/dell/srvadmin/etc/omarolemap
-
-	service dsm_om_connsvc start
-fi
diff --git a/launcher.sh b/launcher.sh
index 800fe3c9c45515019d4cf2e65ee8c45fdb0b9554..c91ec9ffaeb0629ac25d6f02d77dbe3f2fb83443 100755
--- a/launcher.sh
+++ b/launcher.sh
@@ -28,7 +28,6 @@ init() {
 	python3 -u /root/envsetup/envsetup.py 31
 	python3 -u /root/envsetup/envsetup.py 32
 	python3 -u /root/envsetup/envsetup.py 33
-	python3 -u /root/envsetup/envsetup.py 34
 
 	python3 -u /root/envsetup/envsetup.py 11
 	python3 -u /root/envsetup/envsetup.py 12