diff --git a/cloud-toolbox/Containerfile b/cloud-toolbox/Containerfile
index 911db9e..96bf212 100644
--- a/cloud-toolbox/Containerfile
+++ b/cloud-toolbox/Containerfile
@@ -1,15 +1,9 @@
-FROM registry.fedoraproject.org/fedora-minimal
-
-USER root
-
-ENV HISTSIZE=10000
-ENV HISTTIMEFORMAT="%d/%m/%y %T "
-ENV HISTFILESIZE=100000
+FROM forgejo.maciej.cloud/pkg/mc-fedora-base
 
 # for helm install script
 ENV VERIFY_CHECKSUM="false" 
 
-ENV PKGS_BASE="fzf git python3-pip rclone rsync bash-completion kubernetes-client"
+ENV PKGS_BASE="git python3-pip rclone rsync kubernetes-client"
 ENV PKGS_TEMP="python3-devel gcc wget tar"
 
 RUN dnf5 install -y ${PKGS_BASE} ${PKGS_TEMP} && \
diff --git a/gui-container/Containerfile b/gui-container/Containerfile
index 9ab46ae..0615c67 100644
--- a/gui-container/Containerfile
+++ b/gui-container/Containerfile
@@ -1,13 +1,8 @@
-FROM registry.fedoraproject.org/fedora-minimal
+FROM forgejo.maciej.cloud/pkg/mc-fedora-base
 
-ENV HISTSIZE=10000
-ENV HISTTIMEFORMAT="%d/%m/%y %T "
-ENV HISTFILESIZE=100000
 ENV QT_QPA_PLATFORM=wayland
 
 ENV GENERAL_PKGS="\
-    bash-completion \
-    procps \
     iproute \
     fzf \
     wget \
@@ -27,6 +22,4 @@ RUN dnf5 install -y \
     ${APPS} \
     && dnf5 clean all
 
-RUN echo $'[ -f /usr/share/fzf/shell/key-bindings.bash ] && source /usr/share/fzf/shell/key-bindings.bash' >> /root/.bashrc
-
 ENTRYPOINT [ "/sbin/init" ]
diff --git a/jupyter/Containerfile b/jupyter/Containerfile
index 58eefb0..5849f35 100644
--- a/jupyter/Containerfile
+++ b/jupyter/Containerfile
@@ -1,14 +1,10 @@
-FROM registry.fedoraproject.org/fedora-minimal
+FROM forgejo.maciej.cloud/pkg/mc-fedora-base
 
 ENV VIRTUAL_ENV=/venv
 ENV PATH=/venv/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
 ENV PKGS_DNF="python nodejs latex xelatex tini"
-ENV PKGS_DNF_BUILD="cargo python3-devel"
-
-ENV HISTSIZE=10000
-ENV HISTTIMEFORMAT="%d/%m/%y %T "
-ENV HISTFILESIZE=200000
+ENV PKGS_DNF_BUILD="cargo cmake python3-devel"
 
 ENV PKGS_PIP="jupyter \
     bash_kernel \
diff --git a/system-toolbox/Containerfile b/system-toolbox/Containerfile
index 4578068..6508f09 100644
--- a/system-toolbox/Containerfile
+++ b/system-toolbox/Containerfile
@@ -1,12 +1,6 @@
-FROM registry.fedoraproject.org/fedora-minimal
+FROM forgejo.maciej.cloud/pkg/mc-fedora-base
 
-USER root
-
-ENV HISTSIZE=10000
-ENV HISTTIMEFORMAT="%d/%m/%y %T "
-ENV HISTFILESIZE=100000
-
-ENV PKGS_BASE="fzf bash-completion python3-cryptography"
+ENV PKGS_BASE="python3-cryptography"
 
 ENV PKGS_GENERAL="htop \
     btop \
@@ -37,17 +31,11 @@ ENV PKGS_NETWORK="bind-utils \
     iptraf-ng \
     mtr"
 
+COPY help-toolbox.sh /usr/bin/help-toolbox
+
 RUN dnf5 install -y ${PKGS_BASE} ${PKGS_GENERAL} ${PKGS_PROCESSES} ${PKGS_NETWORK} && \
+    chmod 555 /usr/bin/help-toolbox && \
     dnf5 -y autoremove && \
     dnf5 -y clean all
 
-COPY help-toolbox.sh /usr/bin/help-toolbox
 COPY ./bin /usr/local/bin
-
-RUN chmod 555 /usr/bin/help-toolbox && \
-    echo $'[ -f /usr/share/fzf/shell/key-bindings.bash ] && source /usr/share/fzf/shell/key-bindings.bash;\
-source /etc/profile.d/bash_completion.sh;\
-PS1=\'[system-toolbox \W/]\$ \'\
-' >> /root/.bashrc
-
-USER root
diff --git a/tor/Containerfile b/tor/Containerfile
index d153a3b..9bda6d7 100644
--- a/tor/Containerfile
+++ b/tor/Containerfile
@@ -1,4 +1,4 @@
-FROM registry.fedoraproject.org/fedora-minimal
+FROM forgejo.maciej.cloud/pkg/mc-fedora-base
 
 RUN dnf5 install -y tor nyx util-linux && \
     dnf5 clean all