diff --git a/docker-compose.extended.armhf.yml b/docker-compose.extended.armhf.yml
deleted file mode 100644
index bc17a8b9..00000000
--- a/docker-compose.extended.armhf.yml
+++ /dev/null
@@ -1,108 +0,0 @@
-version: "3.3"
-services:
-    gateway:
-        volumes:
-            - "/var/run/docker.sock:/var/run/docker.sock"
-        ports:
-            - 8080:8080
-        image: functions/gateway:0.7.0-armhf
-        networks:
-            - functions
-        environment:
-            read_timeout: 10    # set both here, and on your functions
-            write_timeout: 10   # set both here, and on your functions
-            dnsrr: "true"  # Temporarily use dnsrr in place of VIP while issue persists on PWD
-            faas_nats_address: "nats"
-            faas_nats_port: 4222
-        deploy:
-            restart_policy:
-                condition: on-failure
-                delay: 5s
-                max_attempts: 20
-                window: 380s
-            placement:
-                constraints:
-                    - 'node.role == manager'
-                    - 'node.platform.os == linux'
-
-    nats:
-        image: nats-streaming:0.6.0
-        # Uncomment the following port mappings if you wish to expose the 
-        # NATS client and/or management ports
-        # ports:
-        #     - 4222:4222
-        #     - 8222:8222
-        command: "--store memory --cluster_id faas-cluster"
-        networks:
-            - functions
-        deploy:
-            placement:
-                constraints:
-                    - 'node.platform.os == linux'
-
-    queue-worker:
-        image: functions/queue-worker:0.2-armhf
-        networks:
-            - functions
-        deploy:
-            restart_policy:
-                condition: on-failure
-                delay: 5s
-                max_attempts: 20
-                window: 380s
-            placement:
-                constraints:
-                    - 'node.platform.os == linux'
-
-# --
-
-    prometheus:
-        image: alexellis2/prometheus-armhf:1.5.2
-        volumes:
-            - ./prometheus/prometheus.yml:/etc/prometheus/prometheus.yml
-            - ./prometheus/alert.rules:/etc/prometheus/alert.rules
-
-        command: "-config.file=/etc/prometheus/prometheus.yml -storage.local.path=/prometheus -storage.local.memory-chunks=10000 --alertmanager.url=http://alertmanager:9093"
-        ports:
-            - 9090:9090
-        environment:
-            no_proxy:   "gateway"
-        networks:
-            - functions
-        deploy:
-            placement:
-                constraints: [node.role == manager]
-
-
-    alertmanager:
-        image: alexellis2/alertmanager-armhf:0.5.1
-        environment:
-            no_proxy:   "gateway"
-        volumes:
-            - ./prometheus/alertmanager.yml:/alertmanager.yml
-        command:
-            - '-config.file=/alertmanager.yml'
-        networks:
-            - functions
-        # Uncomment the following port mapping if you wish to expose the Prometheus
-        # Alertmanager UI.
-        # ports:
-        #     - 9093:9093
-        deploy:
-            placement:
-                constraints: [node.role == manager]
-
-    markdown:
-        image: functions/markdownrender:latest-armhf
-        labels:
-            function: "true"
-        networks:
-            - functions
-        environment:
-            no_proxy:   "gateway"
-            https_proxy: $https_proxy
-
-networks:
-    functions:
-        driver: overlay
-        attachable: true
diff --git a/docker-compose.yml b/docker-compose.yml
index 60f1c016..3f6e8180 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,10 +16,10 @@ services:
             faas_nats_port: 4222
         deploy:
             resources:
-                limits:
-                    memory: 100M
+                # limits:   # Enable if you want to limit memory usage
+                #     memory: 200M
                 reservations:
-                    memory: 50M
+                    memory: 100M
             restart_policy:
                 condition: on-failure
                 delay: 5s
@@ -35,7 +35,7 @@ services:
             - "/var/run/docker.sock:/var/run/docker.sock"
         # ports:
             # - 8081:8080
-        image:  functions/faas-swarm:0.2.0
+        image:  functions/faas-swarm:0.2.1
         networks:
             - functions
         environment:
@@ -48,10 +48,10 @@ services:
                     - 'node.role == manager'
                     - 'node.platform.os == linux'
             resources:
-                limits:
-                    memory: 100M
+                # limits:   # Enable if you want to limit memory usage
+                #     memory: 100M
                 reservations:
-                    memory: 50M
+                    memory: 100M
             restart_policy:
                 condition: on-failure
                 delay: 5s
@@ -270,4 +270,3 @@ networks:
         attachable: true
         labels:
           - "openfaas=true"
-