diff --git a/firefly-iii-importer/docker-compose.yml b/firefly-iii-importer/docker-compose.yml
new file mode 100644
index 00000000..c651b276
--- /dev/null
+++ b/firefly-iii-importer/docker-compose.yml
@@ -0,0 +1,15 @@
+version: "3.7"
+
+services:
+  app_proxy:
+    environment:
+      APP_HOST: firefly-iii-importer_importer_1
+      APP_PORT: 8080
+
+  importer:
+    image: fireflyiii/data-importer:version-1.4.0@sha256:05f8e99dbafe57f7f2158298253d20c9fb27733abeec9e9c17ad8e951760464d
+    restart: on-failure
+    environment:
+      # firefly-iii container:
+      - FIREFLY_III_URL=http://firefly-iii_server_1:8080
+      - VANITY_URL=http://${DEVICE_DOMAIN_NAME}:30009
\ No newline at end of file
diff --git a/firefly-iii-importer/hooks/pre-start b/firefly-iii-importer/hooks/pre-start
new file mode 100755
index 00000000..340516d6
--- /dev/null
+++ b/firefly-iii-importer/hooks/pre-start
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# Delay starting Firefly III Importer until Firefly III main app has started
+
+FIREFLY_CONTAINER_NAME="firefly-iii_server_1"
+
+while true; do
+    if [ "$(docker ps -q -f name=$FIREFLY_CONTAINER_NAME)" ]; then
+        # If firefly-iii server container is running then we break and exit so that the importer can start
+        echo "$FIREFLY_CONTAINER_NAME is running"
+        break
+    else
+        # If the container is not running, wait for 5 seconds and then check again
+        echo "Waiting for $FIREFLY_CONTAINER_NAME to start..."
+        sleep 5
+    fi
+done
\ No newline at end of file
diff --git a/firefly-iii-importer/umbrel-app.yml b/firefly-iii-importer/umbrel-app.yml
new file mode 100644
index 00000000..f689a3f9
--- /dev/null
+++ b/firefly-iii-importer/umbrel-app.yml
@@ -0,0 +1,34 @@
+manifestVersion: 1.1
+id: firefly-iii-importer
+category: finance
+name: Firefly III Importer
+version: "1.4.0"
+tagline: Import your transactions into Firefly III
+description: >-
+  Firefly III is a manager for your personal finances. The data importer is built to help you import transactions into Firefly III. It is separated from Firefly III for security and maintenance reasons.
+
+
+  The data importer does not connect to your bank directly. Instead, it uses Nordigen and SaltEdge to connect to over 6000 banks worldwide. These services are free for Firefly III users, but require registration. Keep in mind these services have their own privacy and data usage policies.
+
+  
+  The data importer can import CSV files you've downloaded from your bank.
+
+  
+  You can run the data importer once, for a bulk import. You can also run it regularly to keep up with new transactions.
+developer: Firefly III
+website: https://www.firefly-iii.org/
+dependencies:
+  - firefly-iii
+repo: https://github.com/firefly-iii/data-importer
+support: https://docs.firefly-iii.org/references/data-importer/json/
+port: 30010
+gallery:
+  - 1.jpg
+  - 2.jpg
+  - 3.jpg
+path: ""
+deterministicPassword: false
+torOnly: false
+releaseNotes: ""
+submitter: Umbrel
+submission: https://github.com/getumbrel/umbrel-apps/pull/948