diff --git a/emacs/.emacs.d/config/init-prodigy.el b/emacs/.emacs.d/config/init-prodigy.el
index 752d7b1..c72bd92 100644
--- a/emacs/.emacs.d/config/init-prodigy.el
+++ b/emacs/.emacs.d/config/init-prodigy.el
@@ -150,7 +150,7 @@
     :cwd "~/lola/core-services/lola_server"
     :stop-signal 'int
     :truncate-output t
-    :init-async (python-service-setup "~/.pyenv/versions/core-services"
+    :init-async (python-service-setup "~/lola/core-services/.venv"
                                       "~/lola/core-services/lola_server/.env"))
 
   (prodigy-define-service
@@ -161,7 +161,7 @@
     :cwd "~/lola/core-services/lola_server"
     :stop-signal 'int
     :truncate-output t
-    :init-async (python-service-setup "~/.pyenv/versions/core-services"
+    :init-async (python-service-setup "~/lola/core-services/.venv"
                                       "~/lola/core-services/lola_server/.env"))
 
   (prodigy-define-service
@@ -176,7 +176,7 @@
     :inhibit-process-filter t
     :stop-signal 'int
     :truncate-output t
-    :init-async (python-service-setup "~/.pyenv/versions/core-services"
+    :init-async (python-service-setup "~/lola/core-services/.venv"
                                       "~/lola/core-services/travel_service/.env"))
 
   (prodigy-define-service
@@ -195,7 +195,7 @@
     :cwd "~/lola/core-services/travel_service"
     :stop-signal 'int
     :truncate-output t
-    :init-async (python-service-setup "~/.pyenv/versions/core-services"
+    :init-async (python-service-setup "~/lola/core-services/.venv"
                                       "~/lola/core-services/travel_service/.env"))
 
   (prodigy-define-service
diff --git a/emacs/.emacs.d/config/init-python.el b/emacs/.emacs.d/config/init-python.el
index 15d00b2..6b695f5 100644
--- a/emacs/.emacs.d/config/init-python.el
+++ b/emacs/.emacs.d/config/init-python.el
@@ -65,6 +65,11 @@
   :custom
   (pyenv-show-active-python-in-modeline nil))
 
+;; A pipenv integration
+(use-package pipenv
+  :defer 2
+  :hook (python-mode . pipenv-mode))
+
 ;; LSP using Microsoft's pyright language server
 (use-package lsp-pyright
   :hook (python-mode . (lambda ()
diff --git a/zsh/.zshenv b/zsh/.zshenv
index baf5ea7..4d3abb0 100644
--- a/zsh/.zshenv
+++ b/zsh/.zshenv
@@ -19,3 +19,6 @@ if [ -d /Applications/Postgres.app ];
 then
     path=(/Applications/Postgres.app/Contents/Versions/latest/bin $path)
 fi
+
+export PIPENV_MAX_DEPTH=20
+export PIPENV_VENV_IN_PROJECT=yes
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 569a78e..0168f2c 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -66,7 +66,7 @@ ZSH_THEME="typewritten"
 # Custom plugins may be added to $ZSH_CUSTOM/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
-plugins=(git direnv pyenv npm nvm)
+plugins=(git direnv pyenv pipenv npm nvm)
 
 source $ZSH/oh-my-zsh.sh