diff --git a/influxdb/Dockerfile b/influxdb/Dockerfile
new file mode 100644
index 0000000..8ffecbb
--- /dev/null
+++ b/influxdb/Dockerfile
@@ -0,0 +1,11 @@
+ARG VERSION
+
+FROM influxdb:${VERSION}
+
+RUN apk update && apk --no-cache add curl wget
+
+COPY KAIGARA_VERSION version
+
+RUN wget "https://github.com/openware/kaigara/releases/download/$(cat version)/kaigara" \
+    && chmod +x ./kaigara \
+    && mv ./kaigara /usr/local/bin
diff --git a/influxdb/KAIGARA_VERSION b/influxdb/KAIGARA_VERSION
new file mode 100644
index 0000000..a1b2880
--- /dev/null
+++ b/influxdb/KAIGARA_VERSION
@@ -0,0 +1 @@
+0.1.31
\ No newline at end of file
diff --git a/influxdb/README.md b/influxdb/README.md
new file mode 100644
index 0000000..7ee629f
--- /dev/null
+++ b/influxdb/README.md
@@ -0,0 +1,5 @@
+## influxdb:1.7.9-alpine with preinstalled Kaigara
+
+This is Docker image of `influxdb:1.7.9-alpine` with the latest stable version of Kaigara environment inside.
+
+[Read more about Kaigara](https://github.com/openware/kaigara)
\ No newline at end of file
diff --git a/influxdb/VERSION b/influxdb/VERSION
new file mode 100644
index 0000000..ef8883a
--- /dev/null
+++ b/influxdb/VERSION
@@ -0,0 +1 @@
+1.7.9-alpine
\ No newline at end of file
diff --git a/mysql/Dockerfile b/mysql/Dockerfile
new file mode 100644
index 0000000..7634a98
--- /dev/null
+++ b/mysql/Dockerfile
@@ -0,0 +1,11 @@
+ARG VERSION
+
+FROM mysql:${VERSION}
+
+RUN apt update -y && apt install -y curl wget
+
+COPY KAIGARA_VERSION version
+
+RUN wget "https://github.com/openware/kaigara/releases/download/$(cat version)/kaigara" \
+    && chmod +x ./kaigara \
+    && mv ./kaigara /usr/local/bin
diff --git a/mysql/KAIGARA_VERSION b/mysql/KAIGARA_VERSION
new file mode 100644
index 0000000..a1b2880
--- /dev/null
+++ b/mysql/KAIGARA_VERSION
@@ -0,0 +1 @@
+0.1.31
\ No newline at end of file
diff --git a/mysql/README.md b/mysql/README.md
new file mode 100644
index 0000000..551dacc
--- /dev/null
+++ b/mysql/README.md
@@ -0,0 +1,5 @@
+## Mysql:5.7 with preinstalled Kaigara
+
+This is Docker image of `mysql:5.7` with the latest stable version of Kaigara environment inside.
+
+[Read more about Kaigara](https://github.com/openware/kaigara)
\ No newline at end of file
diff --git a/mysql/VERSION b/mysql/VERSION
new file mode 100644
index 0000000..43f030c
--- /dev/null
+++ b/mysql/VERSION
@@ -0,0 +1 @@
+5.7
\ No newline at end of file
diff --git a/ow-cli b/ow-cli
index 8b43f2f..7b24b88 100755
--- a/ow-cli
+++ b/ow-cli
@@ -22,7 +22,7 @@ module OpenwareCli
     end
 
     def build(image)
-      shell("docker build -t quay.io/openware/#{image}:#{version(image)} --build-arg=VERSION=#{version(image)} #{image}")
+      shell("docker build --pull -t quay.io/openware/#{image}:#{version(image)} --build-arg=VERSION=#{version(image)} #{image}")
       shell("docker push quay.io/openware/#{image}:#{version(image)}") if push?
     end
 
diff --git a/supabase-postgres/Dockerfile b/supabase-postgres/Dockerfile
new file mode 100644
index 0000000..66d19c7
--- /dev/null
+++ b/supabase-postgres/Dockerfile
@@ -0,0 +1,11 @@
+ARG VERSION
+
+FROM supabase/postgres:${VERSION}
+
+RUN apt update -y && apt install -y curl wget
+
+COPY KAIGARA_VERSION version
+
+RUN wget "https://github.com/openware/kaigara/releases/download/$(cat version)/kaigara" \
+    && chmod +x ./kaigara \
+    && mv ./kaigara /usr/local/bin
diff --git a/supabase-postgres/KAIGARA_VERSION b/supabase-postgres/KAIGARA_VERSION
new file mode 100644
index 0000000..a1b2880
--- /dev/null
+++ b/supabase-postgres/KAIGARA_VERSION
@@ -0,0 +1 @@
+0.1.31
\ No newline at end of file
diff --git a/supabase-postgres/README.md b/supabase-postgres/README.md
new file mode 100644
index 0000000..90053ba
--- /dev/null
+++ b/supabase-postgres/README.md
@@ -0,0 +1,5 @@
+## supabase/postgres:13.3.0 with preinstalled Kaigara
+
+This is Docker image of `supabase/postgres:13.3.0` with the latest stable version of Kaigara environment inside.
+
+[Read more about Kaigara](https://github.com/openware/kaigara)
\ No newline at end of file
diff --git a/supabase-postgres/VERSION b/supabase-postgres/VERSION
new file mode 100644
index 0000000..e70d8de
--- /dev/null
+++ b/supabase-postgres/VERSION
@@ -0,0 +1 @@
+13.3.0
\ No newline at end of file