diff --git a/assets/bin/run b/assets/bin/run
index 0e8086461..d59721712 100755
--- a/assets/bin/run
+++ b/assets/bin/run
@@ -2,8 +2,12 @@
 
 export SYSTEMD_IGNORE_CHROOT=1
 
-enable_tuned_unix_socket() {
-  sed -Ei 's|^#?\s*enable_unix_socket\s*=.*$|enable_unix_socket = 1|' /etc/tuned/tuned-main.conf
+set_tuned_main_opt() {
+  local key=$1
+  local val=$2
+  local tuned_main_conf=/etc/tuned/tuned-main.conf
+
+  sed -Ei 's|^#?\s*'"$key"'\s*=.*$|'"$key"' = '"$val"'|' $tuned_main_conf
 }
 
 start() {
@@ -14,7 +18,8 @@ start() {
   # - http://bugs.python.org/issue1663329
   ulimit -Sn 1024	# workaround for the issue above
 
-  enable_tuned_unix_socket
+  set_tuned_main_opt enable_unix_socket 1
+  set_tuned_main_opt rollback not_on_exit
 
   exec /usr/bin/openshift-tuned \
     -v=0
diff --git a/examples/ingress.yaml b/examples/ingress.yaml
index d1a833200..fdf2584a9 100644
--- a/examples/ingress.yaml
+++ b/examples/ingress.yaml
@@ -10,7 +10,8 @@ spec:
       summary=Custom OpenShift ingress profile
       include=openshift-control-plane
       [sysctl]
-      net.ipv4.ip_local_port_range="1024 65535"
+      # Comments start with '#' and run till the end of the line.
+      # net.ipv4.ip_local_port_range="1024 65535"
       net.ipv4.tcp_tw_reuse=1
     name: openshift-ingress
   recommend:
diff --git a/test/e2e/basic/rollback.go b/test/e2e/basic/rollback.go
index 5e88ad2b7..27408868d 100644
--- a/test/e2e/basic/rollback.go
+++ b/test/e2e/basic/rollback.go
@@ -92,6 +92,14 @@ var _ = ginkgo.Describe("[basic][rollback] Node Tuning Operator settings rollbac
 			})
 			gomega.Expect(err).NotTo(gomega.HaveOccurred(), explain)
 
+			// rollback = not_on_exit in tuned-main.conf file prevents settings rollback at TuneD exit
+			ginkgo.By(fmt.Sprintf("ensuring the custom %s value (%s) is still set in Pod %s", sysctlVar, "1", pod.Name))
+			_, err = util.WaitForSysctlValueInPod(pollInterval, waitDuration, pod, sysctlVar, "1")
+			gomega.Expect(err).NotTo(gomega.HaveOccurred())
+
+			_, err = util.ExecCmdInPod(pod, "sysctl", fmt.Sprintf("%s=%s", sysctlVar, sysctlValDef))
+			gomega.Expect(err).NotTo(gomega.HaveOccurred()) // sysctl exits 1 when it fails to configure a kernel parameter at runtime
+
 			ginkgo.By(fmt.Sprintf("ensuring the default %s value (%s) is set in Pod %s", sysctlVar, sysctlValDef, pod.Name))
 			_, err = util.WaitForSysctlValueInPod(pollInterval, waitDuration, pod, sysctlVar, sysctlValDef)
 			gomega.Expect(err).NotTo(gomega.HaveOccurred())