diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8265cba..dea31a3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,12 @@
 # CHANGELOG
 
 ## v0.3
+* Add support for confluent schema-registry (#12, #9)
 * Clean kafka dir scripts added (#11)
 * Add meta.constraint that is Kafka specific (#10)
 
 ## v0.2
-* Add support for confluent kafka ( #7 )
+* Add support for confluent kafka (#7)
 
 ## v0.1
 * Initial version
diff --git a/README.md b/README.md
index 2c1aff1..9a639f5 100644
--- a/README.md
+++ b/README.md
@@ -26,8 +26,12 @@ Ensure the docker images are pre-loaded on each node.
 ## Confluent Zookeeper
 
 ```
+> # to clean out zookeeper data dirs
+> bin/clean-zk-dirs.sh
+
 > # to start zookeeper
 > bin/start.sh zk
+
 > # to stop zookeeper
 > bin/stop.sh zk
 ```
@@ -35,8 +39,22 @@ Ensure the docker images are pre-loaded on each node.
 ## Confluent Kafka
 
 ```
+> # to clean out kafka data dirs
+> bin/clean-kafka-dirs.sh
+
 > # to start kafka
 > bin/start.sh kafka
+
 > # to stop kafka
 > bin/stop.sh kafka
 ```
+
+## Confluent Schema-Registry
+
+```
+> # to start schema-registry
+> bin/start.sh schema-registry
+
+> # to stop schema-registry
+> bin/stop.sh schema-registry
+```
diff --git a/bin/clean-zk-dirs.sh b/bin/clean-zk-dirs.sh
new file mode 100755
index 0000000..9d54b87
--- /dev/null
+++ b/bin/clean-zk-dirs.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+NODES='node2 node3 node4'
+for node in ${NODES}; do
+  NODE_ID=`vagrant global-status | grep ${node} | awk '{print $1}'`
+  vagrant ssh ${NODE_ID} -c "sudo rm -rf /opt/zookeeper"
+done
diff --git a/bin/pull-images.sh b/bin/pull-images.sh
index 9749b70..8d2b0c6 100755
--- a/bin/pull-images.sh
+++ b/bin/pull-images.sh
@@ -1,8 +1,12 @@
 #!/bin/bash
 
 NODES='node2 node3 node4'
+VERSION='4.1.1-2'
 for node in ${NODES}; do
   NODE_ID=`vagrant global-status | grep ${node} | awk '{print $1}'`
-  vagrant ssh ${NODE_ID} -c "docker pull confluentinc/cp-zookeeper:4.1.1-2"
-  vagrant ssh ${NODE_ID} -c "docker pull confluentinc/cp-kafka:4.1.1-2"
+  vagrant ssh ${NODE_ID} -c "docker pull confluentinc/cp-zookeeper:${VERSION}"
+  vagrant ssh ${NODE_ID} -c "docker pull confluentinc/cp-kafka:${VERSION}"
+  if [[ "${node}" =~ "node2" ]]; then
+    vagrant ssh ${NODE_ID} -c "docker pull confluentinc/cp-schema-registry:${VERSION}"
+  fi
 done
diff --git a/jobs/kafka.hcl b/jobs/kafka.hcl
index bf820eb..c9681d3 100644
--- a/jobs/kafka.hcl
+++ b/jobs/kafka.hcl
@@ -1,4 +1,5 @@
-# Zookeeper
+# Nomad job for kafka
+# DISCLAIMER: This is intended for learning purposes only. It has not been tested for PRODUCTION environments.
 job "kafka" {
     region = "global"
     datacenters = ["dc1"]
@@ -48,18 +49,19 @@ job "kafka" {
             template {
               data        = <<EOT
                 # generated at deployment
+                CONFLUENT_VERSION = 4.1.1-2
                 {{$i := env "NOMAD_ALLOC_INDEX"}}
-                KAFKA_BROKER_ID             = {{$i | parseInt | add 1}}
-                KAFKA_ZOOKEEPER_CONNECT     = node2:2181,node3:2181,node4:2181
-                KAFKA_ADVERTISED_HOSTNAME   = {{if eq $i "0"}}node2{{else}}{{if eq $i "1"}}node3{{else}}node4{{end}}{{end}}
-                KAFKA_ADVERTISED_LISTENERS  = PLAINTEXT://node{{$i | parseInt | add 2}}:9092
-                KAFKA_DEFAULT_REPLICATION_FACTOR = 3
+                KAFKA_BROKER_ID={{$i | parseInt | add 1}}
+                KAFKA_ZOOKEEPER_CONNECT=node2:2181,node3:2181,node4:2181
+                KAFKA_ADVERTISED_HOSTNAME={{if eq $i "0"}}node2{{else}}{{if eq $i "1"}}node3{{else}}node4{{end}}{{end}}
+                KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://node{{$i | parseInt | add 2}}:9092
+                KAFKA_DEFAULT_REPLICATION_FACTOR=3
               EOT
               destination = "kafka-env/kafka.env"
               env         = true
             }
             config {
-                image = "confluentinc/cp-kafka:4.1.1-2"
+                image = "confluentinc/cp-kafka:${CONFLUENT_VERSION}"
                 hostname = "${KAFKA_ADVERTISED_HOSTNAME}"
                 labels {
                     group = "confluent-kafka"
@@ -82,13 +84,14 @@ job "kafka" {
                 cpu = 1000
                 memory = 512
                 network {
-                    mbits = 10
+                    mbits = 5
                     port "kafka" {
                       static = 9092
                     }
                 }
             }
             service {
+                name = "kafka"
                 tags = ["kafka"]
                 port = "kafka"
                 address_mode = "driver"
diff --git a/jobs/schema-registry.hcl b/jobs/schema-registry.hcl
index 40936e3..f6ee787 100644
--- a/jobs/schema-registry.hcl
+++ b/jobs/schema-registry.hcl
@@ -1,5 +1,7 @@
-# Zookeeper
-job "kafka" {
+# Nomad job for schema-registry
+# DISCLAIMER: This is intended for learning purposes only. It has not been tested for PRODUCTION environments.
+
+job "schema-registry" {
     region = "global"
     datacenters = ["dc1"]
     type = "service"
@@ -19,17 +21,17 @@ job "kafka" {
     # TODO - Need to add meta.kafka to be kafka specific (#8)
     # TODO - Right now piggy-back on ZK meta. Need to add a separate, distinct kafka meta.
     constraint {
-        attribute = "${meta.zookeeper}"
+        attribute = "${meta.schema-registry}"
         value = "true"
     }
 
     # define group
-    group "kafka-group" {
+    group "sr-group" {
 
         # define the number of times the tasks need to be executed
-        count = 3
+        count = 1
 
-        # ensure we are on 3 different nodes
+        # ensure we are on different nodes
         constraint {
             operator  = "distinct_hosts"
             value     = "true"
@@ -43,24 +45,23 @@ job "kafka" {
             mode = "fail"
         }
 
-        task "kafka" {
+        task "schema-registry" {
             driver = "docker"
             template {
               data        = <<EOT
                 # generated at deployment
-                {{$i := env "NOMAD_ALLOC_INDEX"}}
-                KAFKA_BROKER_ID             = {{$i | parseInt | add 1}}
-                KAFKA_ZOOKEEPER_CONNECT     = node2:2181,node3:2181,node4:2181
-                KAFKA_ADVERTISED_HOSTNAME   = {{if eq $i "0"}}node2{{else}}{{if eq $i "1"}}node3{{else}}node4{{end}}{{end}}
-                KAFKA_ADVERTISED_LISTENERS  = PLAINTEXT://node{{$i | parseInt | add 2}}:9092
-                KAFKA_DEFAULT_REPLICATION_FACTOR = 3
+                CONFLUENT_VERSION=4.1.1-2
+                SCHEMA_REGISTRY_KAFKASTORE_CONNECTION_URL=192.168.33.11:2181,192.168.33.12:2181,192.168.33.13:2181
+                SCHEMA_REGISTRY_LISTENERS=http://0.0.0.0:8081
+                SCHEMA_REGISTRY_DEBUG=true
+                SCHEMA_REGISTRY_HOST_NAME=node2
+                SCHEMA_REGISTRY_AVRO_COMPATIBILITY_LEVEL=backward_transitive
               EOT
-              destination = "kafka-env/kafka.env"
+              destination = "schema-registry-env/schema-registry.env"
               env         = true
             }
             config {
-                image = "confluentinc/cp-kafka:4.1.1-2"
-                hostname = "${KAFKA_ADVERTISED_HOSTNAME}"
+                image = "confluentinc/cp-schema-registry:${CONFLUENT_VERSION}"
                 labels {
                     group = "confluent-schema-registry"
                 }
@@ -71,39 +72,39 @@ job "kafka" {
                     "node4:192.168.33.13"
                 ]
                 port_map {
-                    kafka = 8081
+                    sr = 8081
                 }
                 volumes = [
-                    "/opt/schema-registry/data:/var/lib/schema-registry/data",
                     "/opt/schema-registry/secrets:/etc/schema-registry/secrets"
                 ]
             }
             resources {
-                cpu = 1000
-                memory = 512
+                cpu = 200
+                memory = 256
                 network {
-                    mbits = 10
+                    mbits = 1
                     port "sr" {
-                      static = 9092
+                      static = 8081
                     }
                 }
             }
             service {
+                name = "schema-registry"
                 tags = ["schema-registry"]
                 port = "sr"
                 address_mode = "driver"
-# TODO - Need to add a health check
-#                check {
-#                    type = "tcp"
-#                    port = "sr"
-#                    interval = "10s"
-#                    timeout = "2s"
-#                    check_restart {
-#                        limit = 3
-#                        grace = "90s"
-#                        ignore_warnings = false
-#                    }
-#                }
+                check {
+                    type = "http"
+                    port = "sr"
+                    path = "/"
+                    interval = "10s"
+                    timeout = "2s"
+                    check_restart {
+                        limit = 3
+                        grace = "90s"
+                        ignore_warnings = false
+                    }
+                }
             }
         }
     }
diff --git a/jobs/zookeeper.hcl b/jobs/zookeeper.hcl
index 94b6904..75dbb17 100644
--- a/jobs/zookeeper.hcl
+++ b/jobs/zookeeper.hcl
@@ -1,4 +1,6 @@
-# Zookeeper
+# Nomad job for zookeeper
+# DISCLAIMER: This is intended for learning purposes only. It has not been tested for PRODUCTION environments.
+
 job "zookeeper" {
     region = "global"
     datacenters = ["dc1"]
@@ -44,18 +46,22 @@ job "zookeeper" {
             template {
               data        = <<EOT
                 # generated at deployment
+                CONFLUENT_VERSION = 4.1.1-2
                 {{$i := env "NOMAD_ALLOC_INDEX"}}
-                ZOOKEEPER_SERVER_ID   = {{$i | parseInt | add 1}}
-                ZOOKEEPER_SERVERS     = {{if eq $i "0"}}0.0.0.0:2888:3888;192.168.33.12:2888:3888;192.168.33.13:2888:3888{{else}}{{if eq $i "1"}}192.168.33.11:2888:3888;0.0.0.0:2888:3888;192.168.33.13:2888:3888{{else}}192.168.33.11:2888:3888;192.168.33.12:2888:3888;0.0.0.0:2888:3888{{end}}{{end}}
-                ZOOKEEPER_HOST        = {{if eq $i "0"}}node2{{else}}{{if eq $i "1"}}node3{{else}}node4{{end}}{{end}}
-                ZOOKEEPER_IP          = {{if eq $i "0"}}192.168.33.11{{else}}{{if eq $i "1"}}192.168.33.12{{else}}192.168.33.13{{end}}{{end}}
-                ZOOKEEPER_CLIENT_PORT = 2181
+                ZOOKEEPER_SERVER_ID={{$i | parseInt | add 1}}
+                ZOOKEEPER_SERVERS={{if eq $i "0"}}0.0.0.0:2888:3888;192.168.33.12:2888:3888;192.168.33.13:2888:3888{{else}}{{if eq $i "1"}}192.168.33.11:2888:3888;0.0.0.0:2888:3888;192.168.33.13:2888:3888{{else}}192.168.33.11:2888:3888;192.168.33.12:2888:3888;0.0.0.0:2888:3888{{end}}{{end}}
+                ZOOKEEPER_HOST={{if eq $i "0"}}node2{{else}}{{if eq $i "1"}}node3{{else}}node4{{end}}{{end}}
+                ZOOKEEPER_IP={{if eq $i "0"}}192.168.33.11{{else}}{{if eq $i "1"}}192.168.33.12{{else}}192.168.33.13{{end}}{{end}}
+                ZOOKEEPER_CLIENT_PORT=2181
+                ZOOKEEPER_TICK_TIME=2000
+                ZOOKEEPER_SYNC_LIMIT=20
+                ZOOKEEPER_INIT_LIMIT=10
               EOT
               destination = "zk-env/zookeeper.env"
               env         = true
             }
             config {
-                image = "confluentinc/cp-zookeeper:4.1.1-2"
+                image = "confluentinc/cp-zookeeper:${CONFLUENT_VERSION}"
                 hostname = "${ZOOKEEPER_HOST}"
                 labels {
                     group = "confluent-zk"
@@ -80,7 +86,7 @@ job "zookeeper" {
                 cpu = 200
                 memory = 256
                 network {
-                    mbits = 10
+                    mbits = 1
                     port "zk" {
                       static = 2181
                     }
@@ -93,6 +99,7 @@ job "zookeeper" {
                 }
             }
             service {
+                name = "zookeeper"
                 tags = ["zookeeper"]
                 port = "zk"
                 address_mode = "driver"