diff --git a/Dockerfile b/Dockerfile
index 9a5d6d1..fbd541d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -150,7 +150,8 @@ RUN <<EOF
         -a slirp4netns \
         -a rootlesskit \
         -a rootlesskit-docker-proxy \
-        -a nsenter
+        -a nsenter \
+        --disable-manifest-validation
 EOF
 
 ENTRYPOINT [ "/opt/axis/acapsdk/sysroots/x86_64-pokysdk-linux/usr/bin/eap-install.sh" ]
diff --git a/app/manifest.json b/app/manifest.json
index 4cd4988..140e9df 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,5 +1,5 @@
 {
-    "schemaVersion": "1.3",
+    "schemaVersion": "1.8.0",
     "resources": {
         "linux": {
             "user": {
@@ -22,14 +22,11 @@
             "embeddedSdkVersion": "3.0",
             "vendorUrl": "https://www.axis.com",
             "runMode": "once",
-            "version": "2.1.0-preview"
+            "version": "2.0.2-fwsync"
         },
         "installation": {
             "postInstallScript": "postinstallscript.sh"
         },
-        "uninstallation": {
-            "preUninstallScript": "preuninstallscript.sh"
-        },
         "configuration": {
             "paramConfig": [
                 {
@@ -53,7 +50,11 @@
                     "type": "enum:no|No, yes|Yes"
                 }
 
-            ]
+            ],
+            "containers": {
+                "containerHost": true,
+                "createDockerSymlinks": true
+            }
         }
     }
 }
diff --git a/app/postinstallscript.sh b/app/postinstallscript.sh
index 99b5e90..37d1944 100644
--- a/app/postinstallscript.sh
+++ b/app/postinstallscript.sh
@@ -1,42 +1,5 @@
 #!/bin/sh -e
 
-if [ "$(id -un)" != "root" ]; then
-    logger -p user.warn "$0: Must be run as 'root' instead of user '$(id -un)'."
-    exit 77 # EX_NOPERM
-fi
-
-# Get name and uid of acap user and group
-_appname=dockerdwrapperwithcompose
-_appdirectory=/usr/local/packages/$_appname
-_uname="$(stat -c '%U' "$_appdirectory")"
-_uid="$(id "$_uname" -u)"       # user id
-_gid="$(id "$_uname" -g)"       # user group id
-_gname="$(id "$_uname" -gn)"    # user group name
-_all_gids="$(id "$_uname" -G)"  # user sub-group ids
-
-
-# Create mapping for subuid and subgid - both shall use user id as first value!
-echo "$_uid:100000:65536" >> /etc/subuid
-for sub_group_id in $_all_gids ; do
-    if [ "$sub_group_id" -ne "$_gid" ]; then
-        echo "$_uid:$sub_group_id:1" >> /etc/subgid
-    fi
-done
-echo "$_uid:100000:65536" >> /etc/subgid
-
-# Update the app service file to work for our special case
-cat >> /etc/systemd/system/sdkdockerdwrapperwithcompose.service << EOF
-[Unit]
-BindsTo=containerd.service
-After=network-online.target containerd.service var-spool-storage-SD_DISK.mount
-Wants=network-online.target
-After=user@$_uid.service
-Requires=user@$_uid.service
-EOF
-
-# reload daemon for service file changes to take effect
-systemctl daemon-reload
-
 # *** non-root user should be able to do this ****
 
 # Move the daemon.json file into localdata folder
diff --git a/app/preuninstallscript.sh b/app/preuninstallscript.sh
deleted file mode 100644
index a189c83..0000000
--- a/app/preuninstallscript.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh -e
-
-if [ "$(id -un)" != "root" ]; then
-    logger -p user.warn "$0: Must be run as 'root' instead of user '$(id -un)'."
-    exit 77 # EX_NOPERM
-fi
-
-# *** root user required ****
-# TODO Add a check of who the user is and log warning if not root
-
-# Get name and uid of acap user
-_appname=dockerdwrapperwithcompose
-_appdirectory=/usr/local/packages/$_appname
-_uname="$(stat -c '%U' "$_appdirectory")"
-_uid="$(id "$_uname" -u)"
-
-# Remove the subuid/subgid mappings
-sed -i "/$_uid/d" /etc/subuid
-sed -i "/$_uid/d" /etc/subgid
diff --git a/binaries/systemd-user-runtime-dir b/binaries/systemd-user-runtime-dir
deleted file mode 100755
index 0d15523..0000000
Binary files a/binaries/systemd-user-runtime-dir and /dev/null differ