diff --git a/README.md b/README.md
index 3e3d8b7..98c8e72 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,17 @@ podman run --rm -it --privileged \
         --name toolbox toolbox
 ```
 
+## cloud-toolbox
+
+Sounds huge, but it is just set of tools for cloud-based stuff,
+like openstack-cli, rclone, openshift cli, etc...
+
+Also contains `fzf` and bash-completion. Mount your bash_history for
+best experience.
+
+```bash
+podman run --rm -it -v "$HOME/.bash_history:/root/.bash_history" cloud-toolbox:latest
+```
 
 ## gui-container
 
diff --git a/cloud-toolbox/Dockerfile b/cloud-toolbox/Dockerfile
new file mode 100644
index 0000000..342d19e
--- /dev/null
+++ b/cloud-toolbox/Dockerfile
@@ -0,0 +1,30 @@
+FROM registry.fedoraproject.org/fedora:38
+
+USER root
+
+ENV HISTSIZE=10000
+ENV HISTTIMEFORMAT="%d/%m/%y %T "
+ENV HISTFILESIZE=20000
+
+ENV PKGS_BASE="fzf git python3-pip rclone bash-completion"
+ENV PKGS_TEMP="python3-devel gcc wget"
+
+RUN dnf clean all && \
+    dnf install -y ${PKGS_BASE} ${PKGS_TEMP} && \
+    pip3 install python-openstackclient && \
+    wget https://github.com/openshift/origin/releases/download/v3.11.0/openshift-origin-client-tools-v3.11.0-0cbc58b-linux-64bit.tar.gz && \
+    tar -xvf openshift-origin-client-tools-v3.11.0-0cbc58b-linux-64bit.tar.gz && \
+    chmod +x openshift-origin-client-tools-v3.11.0-0cbc58b-linux-64bit/* && \
+    mv openshift-origin-client-tools-v3.11.0-0cbc58b-linux-64bit/oc /usr/bin/ && \
+    rm -rf openshift-origin-client-tools-v3.11.0-0cbc58b-linux-64bit* && \
+    dnf remove -y ${PKGS_TEMP} && \
+    dnf -y autoremove && \
+    dnf -y clean all && \
+    mkdir /data
+
+WORKDIR /data
+
+
+RUN echo $'[ -f /usr/share/fzf/shell/key-bindings.bash ] && source /usr/share/fzf/shell/key-bindings.bash' >> /root/.bashrc
+
+ENTRYPOINT [ "/bin/bash" ]
diff --git a/gui-container/Dockerfile b/gui-container/Dockerfile
index 0b27e48..4c88577 100644
--- a/gui-container/Dockerfile
+++ b/gui-container/Dockerfile
@@ -21,8 +21,6 @@ RUN dnf install -y \
     ${GENERAL_PKGS} \
     && dnf clean all
 
-RUN echo $'[ -f /usr/share/fzf/key-bindings.bash ] && source /usr/share/fzf/key-bindings.bash \n\
-[ -f /usr/share/fzf/shell/key-bindings.bash ] && source /usr/share/fzf/shell/key-bindings.bash \n\
-[ -f /usr/share/fzf/completion.bash ] && source /usr/share/fzf/completion.bash' >> /root/.bashrc
+RUN echo $'[ -f /usr/share/fzf/shell/key-bindings.bash ] && source /usr/share/fzf/shell/key-bindings.bash' >> /root/.bashrc
 
 ENTRYPOINT [ "/bin/bash" ]
diff --git a/toolbox/Dockerfile b/toolbox/Dockerfile
index 4fd4744..a724dd9 100644
--- a/toolbox/Dockerfile
+++ b/toolbox/Dockerfile
@@ -2,7 +2,8 @@ FROM registry.fedoraproject.org/fedora:38
 
 ENV PKGS_GENERAL="htop \
     btop \
-    sysstat"
+    sysstat \
+    util-linux"
 
 ENV PKGS_PROCESSES="procps-ng \
     strace"