diff --git a/.bashrc.kuba b/.bashrc.kuba
index d6881cb..7114704 100755
--- a/.bashrc.kuba
+++ b/.bashrc.kuba
@@ -18,8 +18,6 @@ export PATH="$HOME/git/esp-open-sdk/xtensa-lx106-elf/bin/:$PATH"
 
 alias dotfiles="/usr/bin/git --git-dir=$HOME/.dotfiles.git --work-tree=$HOME"
 alias dvim="GIT_WORK_TREE='/home/kuba' GIT_DIR='/home/kuba/.dotfiles.git/' vim"
-alias pip=pip3
-alias python=python3
 
 # Source git prompt
 source_existing ~/scripts/git-prompt.sh
@@ -27,7 +25,10 @@ source_existing ~/.bash_prompt.kuba
 
 # Source lmod module setup
 source_existing /usr/share/lmod/lmod/init/profile
-[ -e /usr/share/lmod/lmod/init/profile ] && module use "$HOME/.modules.kuba/"
+if [ -e /usr/share/lmod/lmod/init/profile ]; then
+   module use "$HOME/.modules.kuba/"
+   module load python-wrap
+fi
 
 if xhost >& /dev/null ; then
     # X is running
diff --git a/.modules.kuba/python-wrap.lua b/.modules.kuba/python-wrap.lua
new file mode 100644
index 0000000..f15732c
--- /dev/null
+++ b/.modules.kuba/python-wrap.lua
@@ -0,0 +1,8 @@
+local name    = myModuleName()
+local version = myModuleVersion()
+local wrapdir = pathJoin("/tmp", name .. version)
+
+prepend_path("PATH", wrapdir)
+execute {cmd='mkdir -p ' .. wrapdir, modeA={"load"}}
+execute {cmd='ln -sf /usr/bin/python3 ' .. pathJoin(wrapdir, "python"), modeA={"load"}}
+execute {cmd='ln -sf /usr/bin/pip3'     .. pathJoin(wrapdir, "pip"), modeA={"load"}}