diff --git a/appliances/clavister-netsheild.gns3a b/appliances/clavister-netsheild.gns3a
new file mode 100644
index 0000000..eb0cf63
--- /dev/null
+++ b/appliances/clavister-netsheild.gns3a
@@ -0,0 +1,46 @@
+{
+    "appliance_id": "39c6b8db-8dc3-4b04-8727-7d0b414be7c8",
+    "name": "Clavister NetShield",
+    "category": "firewall",
+    "description": "Clavister NetShield (cOS Stream) Virtual Appliance offers the same functionality as the Clavister NetShield physical NGappliances FWs in a virtual environment.",
+    "vendor_name": "Clavister",
+    "vendor_url": "https://www.clavister.com/",
+    "documentation_url": "https://kb.clavister.com",
+    "product_name": "NetShield",
+    "product_url": "https://www.clavister.com/products/netshield/",
+    "registry_version": 4,
+    "status": "stable",
+    "availability": "free-to-try",
+    "maintainer": "Mattias Nordlund",
+    "maintainer_email": "mattias.nordlund@clavister.com",
+    "usage": "No configuration by default, oen console to set IPs and activate configuration.",
+    "port_name_format": "if{0}",
+    "qemu": {
+        "adapter_type": "virtio-net-pci",
+        "adapters": 4,
+        "ram": 1024,      
+        "hda_disk_interface": "virtio",
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "boot_priority": "c",
+        "kvm": "allow",
+        "options": "-cpu Nehalem"
+    },
+    "images": [
+        {
+            "filename": "clavister-cos-stream-3.80.09.01-virtual-x64-generic.qcow2",
+            "version": "cOS Strean 3.80.09",
+            "md5sum": "b57d8e0f1a3cdd4b2c96ffbc7d7c4f05",
+            "filesize": 134217728,
+            "download_url": "https://my.clavister.com/download/c44639bf-b082-ec11-8308-005056956b6b"
+        }
+    ],
+    "versions": [
+        {
+            "images": {
+                "hda_disk_image": "clavister-cos-stream-3.80.09.01-virtual-x64-generic.qcow2"
+            },
+            "name": "cOS Strean 3.80.09"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/appliances/clavister-netwall.gns3a b/appliances/clavister-netwall.gns3a
new file mode 100644
index 0000000..37d2e59
--- /dev/null
+++ b/appliances/clavister-netwall.gns3a
@@ -0,0 +1,58 @@
+{
+    "appliance_id": "68ddb1dc-e55b-4bcc-9c18-27a9eb5e7413",
+    "name": "Clavister NetWall",
+    "category": "firewall",
+    "description": "Clavister NetWall (cOS Core) Virtual Appliance offers the same functionality as the Clavister  NetWall physical NGFWs in a virtual environment.",
+    "vendor_name": "Clavister",
+    "vendor_url": "https://www.clavister.com/",
+    "documentation_url": "https://kb.clavister.com",
+    "product_name": "NetWall",
+    "product_url": "https://www.clavister.com/products/ngfw/",
+    "registry_version": 4,
+    "status": "stable",
+    "availability": "free-to-try",
+    "maintainer": "Mattias Nordlund",
+    "maintainer_email": "mattias.nordlund@clavister.com",
+    "usage": "DHCP enabled on all interfaces by default, WebUI/SSH access enabled on the local network connected to If1.",
+    "port_name_format": "If{0}",
+    "qemu": {
+        "adapter_type": "e1000",
+        "adapters": 4,
+        "ram": 512,
+        "hda_disk_interface": "virtio",
+        "arch": "x86_64",
+        "console_type": "telnet",
+        "boot_priority": "c",
+        "kvm": "allow"
+    },
+    "images": [
+        {
+            "filename": "clavister-cos-core-14.00.01.13-kvm-en.img",
+            "version": "cOS Core 14.00.01 (x86)",
+            "md5sum": "6c72eb0bb13d191912ca930b72071d07",
+            "filesize": 134217728,
+            "download_url": "https://my.clavister.com/download/ee3ecb2f-7662-ec11-8308-005056956b6b"
+        },
+        {
+            "filename": "clavister-cos-core-14.00.00.12-kvm-en.img",
+            "version": "cOS Core 14.00.00 (x86)",
+            "md5sum": "496ddd494b226e3508563db837643910",
+            "filesize": 134217728,
+            "download_url": "https://my.clavister.com/download/b2b7bce8-4449-ec11-8308-005056956b6b"
+        }
+    ],
+    "versions": [
+        {
+            "images": {
+                "hda_disk_image": "clavister-cos-core-14.00.01.13-kvm-en.img"
+            },
+            "name": "cOS Core 14.00.01 (x86)"
+        },
+        {
+            "images": {
+                "hda_disk_image": "clavister-cos-core-14.00.00.12-kvm-en.img"
+            },
+            "name": "cOS Core 14.00.00 (x86)"
+        }
+    ]
+}
diff --git a/docker/openvswitch/Dockerfile b/docker/openvswitch/Dockerfile
index 6b33bd9..1810f46 100644
--- a/docker/openvswitch/Dockerfile
+++ b/docker/openvswitch/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.3
+FROM alpine:latest
 
 RUN apk add --update openvswitch nano && rm -rf /var/cache/apk/*