diff --git a/experimental/yugabyte-workspace/Dockerfile b/experimental/yugabyte-workspace/Dockerfile
new file mode 100644
index 0000000..d2663a5
--- /dev/null
+++ b/experimental/yugabyte-workspace/Dockerfile
@@ -0,0 +1,18 @@
+ARG docker_registry=docker.io/alnoda
+ARG image_tag=0.1
+
+FROM ${docker_registry}/postgres-workspace:${image_tag}
+
+USER root
+
+RUN echo "------------------------------------------------------ yugabyte 2.11" \
+    && cd /tmp/ && wget https://downloads.yugabyte.com/releases/2.11.0.0/yugabyte-2.11.0.0-b7-linux-x86_64.tar.gz \
+    && tar xvfz /tmp/yugabyte-2.11.0.0-b7-linux-x86_64.tar.gz \
+    && mv /tmp/yugabyte-2.11.0.0/ /opt/yugabyte \
+    && /opt/yugabyte/bin/post_install.sh \
+    && echo "------------------------------------------------------ user" \
+    && chown -R abc /opt/yugabyte
+
+ENV PATH="/opt/yugabyte/bin:/opt/yugabyte/postgres/bin:${PATH}"
+
+USER abc
diff --git a/workspaces/postgres-workspace/Dockerfile b/workspaces/postgres-workspace/Dockerfile
index bc490ab..c5f415e 100644
--- a/workspaces/postgres-workspace/Dockerfile
+++ b/workspaces/postgres-workspace/Dockerfile
@@ -129,6 +129,7 @@ RUN echo "------------------------------------------------------ postgres" \
     && echo "------------------------------------------------------ yuniql" \   
     && curl https://github.com/rdagumampan/yuniql/releases/download/v1.1.55/yuniql-cli-linux-x64-latest.tar.gz -L -o /tmp/yuniql.tar.gz \
     && tar -xvzf /tmp/yuniql.tar.gz -C /bin \
+    && rm /tmp/yuniql.tar.gz \
     && echo "------------------------------------------------------ migra" \ 
     && pip install migra==3.0.1621480950 \
     # && echo "------------------------------------------------------ pgsh" \ 
diff --git a/workspaces/postgres-workspace/README.md b/workspaces/postgres-workspace/README.md
index 6610bca..a5f818f 100644
--- a/workspaces/postgres-workspace/README.md
+++ b/workspaces/postgres-workspace/README.md
@@ -602,6 +602,7 @@ git clone https://github.com/lob/pg_insights /home/pg_insights
 Any contribution is welcome! If you believe some tool should be added, feel free to create a pull request.
 
 __Potential candidates__
+- [dbmate](https://github.com/amacneil/dbmate)
 - [pg_back](https://github.com/orgrim/pg_back)
 - [trdsql](https://github.com/noborus/trdsql#PostgreSQL)
 - [eralchemy](https://github.com/Alexis-benoist/eralchemy). Functionality already available by schemaspy. But can be useful for custom doc preparation.
diff --git a/workspaces/ubuntu-workspace/README.md b/workspaces/ubuntu-workspace/README.md
index 63b610f..9f2d472 100644
--- a/workspaces/ubuntu-workspace/README.md
+++ b/workspaces/ubuntu-workspace/README.md
@@ -598,5 +598,7 @@ docker run --name space-4 -d -p 19011:19011 space-image:0.4
 The application is running and can be accessed on localhost:19011   
 It will be running even if you stop the container, or commit it and create new images
 
-##### Potential features
-- [hyper](https://github.com/vercel/hyper)
\ No newline at end of file
+### Candidates
+- [spacemacs](https://www.spacemacs.org/)
+- [hyper](https://github.com/vercel/hyper)
+- [xplr](https://github.com/sayanarijit/xplr)
\ No newline at end of file