diff --git a/.env b/.env
index 580cea5..0645418 100644
--- a/.env
+++ b/.env
@@ -91,4 +91,6 @@ MARIADB_EXTERNAL_PORT=3306
 PHOTOPRISM_EXTERNAL_PORT=2342
 PHOTOPRISM_INTERNAL_PORT=2342
 SONARR_TV_STANDARD_EXTERNAL_PORT=8989
-SONARR_INTERNAL_PORT=8989
\ No newline at end of file
+SONARR_INTERNAL_PORT=8989
+BASEROW_EXTERNAL_PORT=8089
+BASEROW_INTERNAL_PORT=80
\ No newline at end of file
diff --git a/baserow.env b/baserow.env
new file mode 100644
index 0000000..55a20f7
--- /dev/null
+++ b/baserow.env
@@ -0,0 +1,11 @@
+BASEROW_PUBLIC_URL=https://baserow.${DOMAIN}
+DATABASE_HOST=postgres
+DATABASE_NAME=baserow
+DATABASE_USER=baserow
+EMAIL_SMTP=1
+EMAIL_SMTP_HOST=smtp.gmail.com
+EMAIL_SMTP_PASSWORD=sebrubdsgkuptcjr
+EMAIL_SMTP_PORT=587
+EMAIL_SMTP_USE_TLS=1
+EMAIL_SMTP_USER=kucharczyk.lukas@gmail.com
+FROM_EMAIL=kucharczyk.lukas@gmail.com
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index d2e0d93..2857350 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -740,6 +740,23 @@ services:
     profiles:
       - base
       - media
+
+  baserow:
+    container_name: baserow
+    image: baserow/baserow:latest
+    networks:
+      - public
+      - postgres
+    ports:
+      - "${BASEROW_EXTERNAL_PORT}:${BASEROW_INTERNAL_PORT}"
+    env_file:
+      - baserow.env
+    volumes:
+      - "${DOCKER_STORAGE_PATH}/baserow:/baserow/data"
+    restart: unless-stopped
+    profiles:
+      - base
+
     
 
         
diff --git a/penpot.env b/penpot.env
new file mode 100644
index 0000000..ef072fb
--- /dev/null
+++ b/penpot.env
@@ -0,0 +1,11 @@
+--2023-01-05 19:27:46--  https://raw.githubusercontent.com/penpot/penpot/main/docker/images/config.env
+Resolving raw.githubusercontent.com (raw.githubusercontent.com)... 185.199.110.133, 185.199.109.133, 185.199.111.133, ...
+Connecting to raw.githubusercontent.com (raw.githubusercontent.com)|185.199.110.133|:443... connected.
+HTTP request sent, awaiting response... 200 OK
+Length: 2713 (2.6K) [text/plain]
+Saving to: ‘config.env.1’
+
+     0K ..                                                    100%  123M=0s
+
+2023-01-05 19:27:46 (123 MB/s) - ‘config.env.1’ saved [2713/2713]
+
diff --git a/penpot.yml b/penpot.yml
new file mode 100644
index 0000000..fbc23d0
--- /dev/null
+++ b/penpot.yml
@@ -0,0 +1,75 @@
+---
+networks:
+  penpot:
+
+volumes:
+  penpot_postgres_data:
+  penpot_assets_data:
+
+services:
+  penpot-frontend:
+    image: "penpotapp/frontend:latest"
+    ports:
+      - 9001:80
+
+    volumes:
+      - ${DOCKER_STORAGE_PATH}/penpot/data:/opt/data$
+
+    env_file:
+      - penpot.env
+
+    depends_on:
+      - penpot-backend
+      - penpot-exporter
+
+    networks:
+      - penpot
+
+  penpot-backend:
+    image: "penpotapp/backend:latest"
+    volumes:
+      - penpot_assets_data:/opt/data
+
+    depends_on:
+      - penpot-postgres
+      - penpot-redis
+
+    env_file:
+      - config.env
+
+    networks:
+      - penpot
+
+  penpot-exporter:
+    image: "penpotapp/exporter:latest"
+    env_file:
+      - config.env
+    environment:
+      # Don't touch it; this uses internal docker network to
+      # communicate with the frontend.
+      - PENPOT_PUBLIC_URI=http://penpot-frontend
+    networks:
+      - penpot
+
+  penpot-postgres:
+    image: "postgres:14"
+    restart: always
+    stop_signal: SIGINT
+
+    environment:
+      - POSTGRES_INITDB_ARGS=--data-checksums
+      - POSTGRES_DB=penpot
+      - POSTGRES_USER=penpot
+      - POSTGRES_PASSWORD=penpot
+
+    volumes:
+      - penpot_postgres_data:/var/lib/postgresql/data
+
+    networks:
+      - penpot
+
+  penpot-redis:
+    image: redis:7
+    restart: always
+    networks:
+      - penpot