diff --git a/Dockerfile b/Dockerfile
index c2fb8ff..bbbaa6e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,18 +1,17 @@
-FROM registry.fedoraproject.org/fedora:27
+FROM registry.fedoraproject.org/fedora:rawhide
 
-ENV VERSION=0 RELEASE=25 ARCH=x86_64
+ENV VERSION=0 ARCH=x86_64
 LABEL com.redhat.component="docker" \
-      name="$FGC/docker" \
+      name="docker" \
       version="$VERSION" \
-      release="$RELEASE.$DISTTAG" \
       architecture="$ARCH" \
       usage="atomic install --system --system-package=no docker && systemctl start docker" \
       summary="The docker daemon as a system container." \
       maintainer="Giuseppe Scrivano <gscrivan@redhat.com>" \
       atomic.type="system"
 
-RUN dnf install --setopt=tsflags=nodocs -y docker container-storage-setup container-selinux cloud-utils-growpart docker-novolume-plugin lvm2 iptables procps-ng xz oci-register-machine \
-    && rpm --nofiles -V docker container-storage-setup container-selinux cloud-utils-growpart docker-novolume-plugin lvm2 iptables procps-ng xz oci-register-machine \
+RUN dnf install --setopt=tsflags=nodocs -y docker container-storage-setup container-selinux cloud-utils-growpart python-docker-py docker-novolume-plugin lvm2 iptables procps-ng xz oci-register-machine \
+    && rpm -V docker container-storage-setup container-selinux cloud-utils-growpart python-docker-py docker-novolume-plugin lvm2 iptables procps-ng xz oci-register-machine \
     && mkdir -p /usr/lib/modules && dnf clean all
 
 RUN ln -s /usr/libexec/docker/docker-runc-current /usr/bin/docker-runc
diff --git a/config.json.template b/config.json.template
index 1ba477c..3ce615c 100644
--- a/config.json.template
+++ b/config.json.template
@@ -5,7 +5,6 @@
 	"arch": "amd64"
     },
     "process": {
-	"selinuxLabel": "system_u:system_r:container_runtime_t:s0",
 	"terminal": false,
 	"user": {
 	    "uid": 0,
@@ -284,17 +283,6 @@
 		"mode=755"
 	    ]
 	},
-	{
-	    "type": "bind",
-	    "source": "/opt",
-	    "destination": "/opt",
-	    "options": [
-		"rbind",
-		"rslave",
-		"rw",
-		"mode=755"
-	    ]
-	},
 	{
 	    "type": "bind",
 	    "source": "/mnt",
@@ -306,6 +294,17 @@
 		"mode=755"
             ]
 	},
+	{
+	    "type": "bind",
+	    "source": "/usr/share/rhel",
+	    "destination": "/usr/share/rhel",
+	    "options": [
+		"rprivate",
+		"rbind",
+		"ro",
+		"mode=755"
+	    ]
+	},
 	{
 	    "type": "bind",
 	    "source": "${RUN_DIRECTORY}",
@@ -378,11 +377,10 @@
 		"private"
 	    ]
 	}
-        $ADDTL_MOUNTS
     ],
     "hooks": {},
     "linux": {
-	"rootfsPropagation": "rslave",
+	"rootfsPropagation": "private",
 	"resources": {
 	    "devices": [
 		{
@@ -395,6 +393,7 @@
 	    {
 		"type": "mount"
 	    }
-	]
+	],
+	"selinuxProcessLabel": "system_u:system_r:container_runtime_t:s0"
     }
 }