diff --git a/.gitmodules b/.gitmodules
index c779253..2daed57 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "tools/cvelist"]
 	path = tools/cvelist
 	url = https://github.com/CVEProject/cvelist
+[submodule "containers/domain_registration_tracker/nicinfo"]
+	path = containers/domain_registration_tracker/nicinfo
+	url = git@github.com:arineng/nicinfo.git
diff --git a/containers/domain_registration_tracker/Dockerfile b/containers/domain_registration_tracker/Dockerfile
new file mode 100644
index 0000000..7564711
--- /dev/null
+++ b/containers/domain_registration_tracker/Dockerfile
@@ -0,0 +1,11 @@
+FROM alpinelab/ruby-dev
+
+RUN apt-get update \
+ && apt-get install --assume-yes --no-install-recommends --no-install-suggests \
+ pry \
+ && apt-get install --assume-yes --no-install-recommends --no-install-suggests\
+ jq \
+ && rm -rf /var/lib/apt/lists/* \
+ && wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -O /usr/bin/yq &&\
+    chmod +x /usr/bin/yq \
+&& curl -sSL https://bit.ly/install-xq | bash 
diff --git a/containers/domain_registration_tracker/docker-compose.yml b/containers/domain_registration_tracker/docker-compose.yml
new file mode 100644
index 0000000..ee4ddf5
--- /dev/null
+++ b/containers/domain_registration_tracker/docker-compose.yml
@@ -0,0 +1,14 @@
+version: "3"
+volumes:
+  bundle:       { driver: local }
+  node_modules: { driver: local }
+  config:       { driver: local }
+services:
+  app:
+    build: .
+    ports: ["5000:5000"]
+    volumes:
+      - .:/app
+      - bundle:/bundle
+      - node_modules:/app/node_modules
+      - config:/config
diff --git a/containers/domain_registration_tracker/nicinfo b/containers/domain_registration_tracker/nicinfo
new file mode 160000
index 0000000..ac8b5d1
--- /dev/null
+++ b/containers/domain_registration_tracker/nicinfo
@@ -0,0 +1 @@
+Subproject commit ac8b5d1b36ce7759d9e396af5677a1b4174f0650
diff --git a/containers/domain_registration_tracker/get_iana_registrar_ids.sh b/containers/domain_registration_tracker/src/get_iana_registrar_ids.sh
similarity index 100%
rename from containers/domain_registration_tracker/get_iana_registrar_ids.sh
rename to containers/domain_registration_tracker/src/get_iana_registrar_ids.sh