diff --git a/README.md b/README.md
index 712acc0..92182e2 100644
--- a/README.md
+++ b/README.md
@@ -24,6 +24,21 @@ TODO. Install Ansible, run playbook.
 ansible-playbook main.yml
 ```
 
+Then run specific NVR playbook, e.g.
+
+```
+ansible-playbook shinobi/main.yml
+```
+
+### Shinobi First-time setup
+
+After the playbook completes, visit the URL of your NVR, at the `/super` path, e.g. `http://dvr.local:8080/super`. The default login credentials are:
+
+  - Email: `admin@shinobi.video`
+  - Password: `admin`
+
+TODO.
+
 ## Raspberry Pi NVR Solutions
 
 Here are my notes on different options for DVR/NVR/CCTV solutions that could run on the Pi:
diff --git a/shinobi/Dockerfile b/shinobi/Dockerfile
index e4894e8..4a5cc09 100644
--- a/shinobi/Dockerfile
+++ b/shinobi/Dockerfile
@@ -1,4 +1,4 @@
-FROM arm32v7/node:12.18.3-buster-slim
+FROM arm64v8/node:12.18.3-buster-slim
 
 ENV DB_USER=majesticflame \
     DB_PASSWORD='' \
@@ -83,14 +83,15 @@ RUN apt install -y \
 
 
 WORKDIR /home/Shinobi
-COPY . .
+RUN git clone https://gitlab.com/Shinobi-Systems/Shinobi.git .
+# COPY . .
 #RUN rm -rf /home/Shinobi/plugins
-COPY ./plugins  /home/Shinobi/plugins
+# COPY ./plugins  /home/Shinobi/plugins
 RUN chmod -R 777 /home/Shinobi/plugins
 RUN npm i npm@latest -g && \
     npm install pm2 -g && \
     npm install --unsafe-perm
-COPY ./Docker/pm2.yml ./
+RUN cp Docker/pm2.yml ./
 
 # Copy default configuration files
 # COPY ./config/conf.json ./config/super.json /home/Shinobi/
diff --git a/shinobi/main.yml b/shinobi/main.yml
index 187cccb..7eaa746 100644
--- a/shinobi/main.yml
+++ b/shinobi/main.yml
@@ -34,13 +34,16 @@
         mode: '0755'
       become: false
 
-    - name: Copy Shinobi docker-compose template to Pi.
-      ansible.builtin.template:
-        src: docker-compose.yml
-        dest: "~/shinobi/docker-compose.yml"
+    - name: Copy Shenobi files to Pi.
+      ansible.builtin.copy:
+        src: "{{ item }}"
+        dest: "~/shinobi/{{ item }}"
         mode: '0640'
       become: false
       notify: Restart shenobi
+      with_items:
+        - docker-compose.yml
+        - Dockerfile
 
     - name: Ensure Shinobi is running.
       community.docker.docker_compose: