diff --git a/apps/deluge-vpn.yml b/apps/deluge-vpn.yml
index d4969b9..8facc55 100644
--- a/apps/deluge-vpn.yml
+++ b/apps/deluge-vpn.yml
@@ -15,16 +15,8 @@
         pgrole: 'deluge'
         intport: '8112'
         extport: '8112'
-        intport2: '58846'
-        extport2: '58846'
-        intport3: '58946'
-        extport3: '58946'
-        intport4: '5418'
-        extport4: '5418'
-        intport5: '5419'
-        extport5: '5419'
-        intport6: '8118'
-        extport6: '8118'
+        intport2: '8118'
+        extport2: '8118'
         image: 'binhex/arch-delugevpn'
 
     # CORE (MANDATORY) ############################################################
@@ -34,6 +26,9 @@
     - name: 'Including folders'
       include_tasks: '/opt/communityapps/apps/_downloaders.yml'
 
+    - name: 'Including plugins'
+      include_tasks: '/opt/communityapps/apps/_plugins.yml'
+
     - name: 'Checking for existing app data'
       stat:
         path: /opt/appdata/{{pgrole}}/core.conf
@@ -87,10 +82,6 @@
         published_ports:
           - '{{ports.stdout}}{{extport}}:{{intport}}'
           - '{{ports.stdout}}{{extport2}}:{{intport2}}'
-          - '{{ports.stdout}}{{extport3}}:{{intport3}}'
-          - '{{extport4}}:{{intport4}}'
-          - '{{extport5}}:{{intport5}}'
-          - '{{ports.stdout}}{{extport6}}:{{intport6}}'
         volumes: '{{pg_volumes}}'
         env: '{{pg_env}}'
         restart_policy: unless-stopped
@@ -177,11 +168,10 @@
     - name: 'Configuring {{pgrole}} for first time use'
       block:
         - name: set enabled_plugins
-          lineinfile:
-            path: '/opt/appdata/{{pgrole}}/core.conf'
+          replace:
+            dest: '/opt/appdata/{{pgrole}}/core.conf'
             regexp: '"enabled_plugins".*'
-            line: '"enabled_plugins": ["Extractor", "Label"],'
-            state: present
+            replace: '"enabled_plugins": ["Extractor", "Label"],'
 
         - name: set compact_allocation
           lineinfile:
@@ -280,41 +270,6 @@
             regexp: '"seed_time_ratio_limit".*'
             line: '"seed_time_ratio_limit": 1.0,'
             state: present
-
-        - name: set outgoing_ports
-          lineinfile:
-            path: '/opt/appdata/{{pgrole}}/core.conf'
-            regexp: '"outgoing_ports".*'
-            line: '"outgoing_ports": [{{intport5}}, {{intport5}}],'
-            state: present
-
-        - name: set random_port
-          lineinfile:
-            path: '/opt/appdata/{{pgrole}}/core.conf'
-            regexp: '"random_port".*'
-            line: '"random_port": false,'
-            state: present
-
-        - name: set random_outgoing_ports
-          lineinfile:
-            path: '/opt/appdata/{{pgrole}}/core.conf'
-            regexp: '"random_outgoing_ports".*'
-            line: '"random_outgoing_ports": false,'
-            state: present
-
-        - name: set listen_random_port
-          lineinfile:
-            path: '/opt/appdata/{{pgrole}}/core.conf'
-            regexp: '"listen_random_port".*'
-            line: '"listen_random_port": null,'
-            state: present
-
-        - name: set listen_ports
-          lineinfile:
-            path: '/opt/appdata/{{pgrole}}/core.conf'
-            regexp: '"listen_ports".*'
-            line: '"listen_ports": [{{intport4}},{{intport4}}],'
-            state: present
       when: not confcheck.stat.exists
 
     - name: Restart {{pgrole}}
diff --git a/apps/deluge.yml b/apps/deluge.yml
index f0f4b9d..4c6c116 100644
--- a/apps/deluge.yml
+++ b/apps/deluge.yml
@@ -15,14 +15,6 @@
         pgrole: 'deluge'
         intport: '8112'
         extport: '8112'
-        intport2: '58846'
-        extport2: '58846'
-        intport3: '58946'
-        extport3: '58946'
-        intport4: '5418'
-        extport4: '5418'
-        intport5: '5419'
-        extport5: '5419'
         image: 'linuxserver/deluge'
 
     # CORE (MANDATORY) ############################################################
@@ -80,10 +72,6 @@
         pull: yes
         published_ports:
           - '{{ports.stdout}}{{extport}}:{{intport}}'
-          - '{{ports.stdout}}{{extport2}}:{{intport2}}'
-          - '{{extport3}}:{{intport3}}'
-          - '{{extport4}}:{{intport4}}'
-          - '{{extport5}}:{{intport5}}'
         volumes: '{{pg_volumes}}'
         env: '{{pg_env}}'
         restart_policy: unless-stopped
@@ -170,11 +158,10 @@
     - name: 'Configuring {{pgrole}} for first time use'
       block:
         - name: set enabled_plugins
-          lineinfile:
-            path: '/opt/appdata/{{pgrole}}/core.conf'
+          replace:
+            dest: '/opt/appdata/{{pgrole}}/core.conf'
             regexp: '"enabled_plugins".*'
-            line: '"enabled_plugins": ["Extractor", "Label"],'
-            state: present
+            replace: '"enabled_plugins": ["Extractor", "Label"],'
 
         - name: set compact_allocation
           lineinfile:
@@ -273,41 +260,6 @@
             regexp: '"seed_time_ratio_limit".*'
             line: '"seed_time_ratio_limit": 1.0,'
             state: present
-
-        - name: set outgoing_ports
-          lineinfile:
-            path: '/opt/appdata/{{pgrole}}/core.conf'
-            regexp: '"outgoing_ports".*'
-            line: '"outgoing_ports": [{{intport5}}, {{intport5}}],'
-            state: present
-
-        - name: set random_port
-          lineinfile:
-            path: '/opt/appdata/{{pgrole}}/core.conf'
-            regexp: '"random_port".*'
-            line: '"random_port": false,'
-            state: present
-
-        - name: set random_outgoing_ports
-          lineinfile:
-            path: '/opt/appdata/{{pgrole}}/core.conf'
-            regexp: '"random_outgoing_ports".*'
-            line: '"random_outgoing_ports": false,'
-            state: present
-
-        - name: set listen_random_port
-          lineinfile:
-            path: '/opt/appdata/{{pgrole}}/core.conf'
-            regexp: '"listen_random_port".*'
-            line: '"listen_random_port": null,'
-            state: present
-
-        - name: set listen_ports
-          lineinfile:
-            path: '/opt/appdata/{{pgrole}}/core.conf'
-            regexp: '"listen_ports".*'
-            line: '"listen_ports": [{{intport4}},{{intport4}}],'
-            state: present
       when: not confcheck.stat.exists
 
     - name: Restart {{pgrole}}