diff --git a/appliances/endhost.gns3a b/appliances/endhost.gns3a
new file mode 100644
index 0000000..574db34
--- /dev/null
+++ b/appliances/endhost.gns3a
@@ -0,0 +1,17 @@
+{
+    "appliance_id": "f59a5cf6-baaa-45a6-9685-989a2c3f3f4a",
+    "name": "endhost",
+    "category": "guest",
+    "description": "General purpose alpine-based endhost",
+    "vendor_name": "endhost",
+    "vendor_url": "https://www.alpinelinux.org",
+    "product_name": "endhost",
+    "registry_version": 4,
+    "status": "experimental",
+    "maintainer": "GNS3 Team",
+    "maintainer_email": "developers@gns3.net",
+    "docker": {
+        "adapters": 1,
+        "image": "gns3/endhost:latest"
+    }
+}
diff --git a/appliances/haproxy.gns3a b/appliances/haproxy.gns3a
new file mode 100644
index 0000000..3aa86a1
--- /dev/null
+++ b/appliances/haproxy.gns3a
@@ -0,0 +1,18 @@
+{
+    "appliance_id": "79df483d-8cc9-48de-85ea-e6cb45b93e2a",
+    "name": "haproxy",
+    "category": "guest",
+    "description": "haproxy alpine container",
+    "vendor_name": "haproxy",
+    "vendor_url": "https://www.haproxy.org",
+    "product_name": "haproxy",
+    "registry_version": 4,
+    "status": "experimental",
+    "maintainer": "GNS3 Team",
+    "maintainer_email": "developers@gns3.net",
+    "usage": "Modify /etc/haproxy/haproxy.cfg to suit your needs.",
+    "docker": {
+        "adapters": 1,
+        "image": "gns3/haproxy:latest"
+    }
+}
diff --git a/docker/docker_images b/docker/docker_images
index 39e4ead..c5fd54e 100644
--- a/docker/docker_images
+++ b/docker/docker_images
@@ -3,6 +3,8 @@
 --platform=linux/amd64					# global options
 
 chromium		chromium
+endhost			endhost
+haproxy			haproxy
 ipterm-base		ipterm/base
 ipterm			ipterm/cli
 webterm			ipterm/web
@@ -24,10 +26,6 @@ xeyes			xeyes
 # The following images are not used by any appliance
 #
 
-# AJ Nouri
-#endhost		endhost
-#haproxy		haproxy
-
 # GNS3 Developers
 #dhcp			dhcp
 #snmpsimulator		snmpsimulator
diff --git a/docker/haproxy/haproxy.cfg b/docker/haproxy/haproxy.cfg
index 540fbca..64a4d9b 100644
--- a/docker/haproxy/haproxy.cfg
+++ b/docker/haproxy/haproxy.cfg
@@ -8,7 +8,6 @@ global
     user        haproxy
     group       haproxy
     #daemon
-    debug
 
 #---------------------------------------------------------------------
 # common defaults that all the 'listen' and 'backend' sections will