diff --git a/roles/babashka/tasks/install.yml b/roles/babashka/tasks/install.yml
index 9c7da49..46f38e1 100644
--- a/roles/babashka/tasks/install.yml
+++ b/roles/babashka/tasks/install.yml
@@ -18,8 +18,12 @@
     - name: Install babashka binary
       copy:
         src: /tmp/bb
-        dest: /usr/local/bin/bb
+        dest: /usr/local/bin/bb.real
         remote_src: True
         mode: 755
 
   tags: bb
+
+- name: Install Babashka wrapper for proxy support
+  template: src=bb.j2 dest=/usr/local/bin/bb mode=755
+  tags: bb
diff --git a/roles/babashka/templates/bb.j2 b/roles/babashka/templates/bb.j2
new file mode 100644
index 0000000..67a198a
--- /dev/null
+++ b/roles/babashka/templates/bb.j2
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+exec /usr/local/bin/bb.real \
+  {% if system_proxy is defined and system_proxy != '' %}
+  -Dhttp.proxyHost={{ system_proxy | urlsplit('hostname') }} -Dhttp.proxyPort={{ system_proxy | urlsplit('port') }} -Dhttps.proxyHost={{ system_proxy | urlsplit('hostname') }} -Dhttps.proxyPort={{ system_proxy | urlsplit('port') }} \
+  {% endif %}
+  $@
diff --git a/roles/penpot/defaults/main.yml b/roles/penpot/defaults/main.yml
index cea65ae..a7c65a5 100644
--- a/roles/penpot/defaults/main.yml
+++ b/roles/penpot/defaults/main.yml
@@ -1,7 +1,7 @@
 ---
 
 # Penpot version to deploy
-penpot_version: 1.19.2
+penpot_version: 2.0.0
 # SHould ansible manage upgrades. If False, only the initial install will be done
 penpot_manage_upgrade: True
 
@@ -10,7 +10,7 @@ penpot_root_dir: /opt/penpot
 # URL of the archive
 penpot_archive_url: https://github.com/penpot/penpot/archive/refs/tags/{{ penpot_version }}.tar.gz
 # Expected sha256 of the archive
-penpot_archive_sha256: 14de5b71f13f0fd542234f16fa5a307fbee7088bdfa343a53ff923b3f95f4edb
+penpot_archive_sha256: 133fc088b2e194ffdd3a9816c7fabcf9630699157ce28a242c81cb6283de6af6
 # User under which penpot will run. Will be created
 penpot_user: penpot