diff --git a/broadcast-install.yml b/broadcast-install.yml
index 2ca8d5b..810bd2b 100644
--- a/broadcast-install.yml
+++ b/broadcast-install.yml
@@ -2,73 +2,6 @@
   hosts: all
   name: broadcast-install
   tasks:
-    - name: Wait for apt to unlock
-      become: yes
-      shell:  while sudo fuser /var/lib/dpkg/lock >/dev/null 2>&1; do sleep 5; done;
-
-    - name: Install docker deps
-      apt:
-        pkg:
-          - apt-transport-https
-          - ca-certificates
-          - curl
-          - software-properties-common
-          - python3-pip
-        state: latest
-        update_cache: true
-
-    - name: install docker modules
-      pip:
-        name: "{{ item.name }}"
-        state: present
-      with_items:
-      - { name: docker }
-      - { name: docker-compose }
-      - { name: boto3 }
-
-    - name: Get node exporter
-      get_url:
-        url: https://github.com/prometheus/node_exporter/releases/download/v1.2.2/node_exporter-1.2.2.linux-amd64.tar.gz
-        dest: /tmp/node_exporter-1.2.2.linux-amd64.tar.gz
-
-    - name: Extract node exporter
-      unarchive:
-        src: /tmp/node_exporter-1.2.2.linux-amd64.tar.gz
-        dest: /tmp/
-        remote_src: yes
-
-    - name: Install node exporter
-      copy: 
-        remote_src: yes
-        src: /tmp/node_exporter-1.2.2.linux-amd64/node_exporter
-        dest: /usr/local/bin/node_exporter
-
-    - name: Move node exporter service file
-      copy:
-        src: "{{ playbook_dir }}/payload/init.d/node_exporter.service"
-        dest: /lib/systemd/system/node_exporter.service
-
-    - name: Start node exporter service
-      systemd:
-        state: started
-        name: node_exporter.service
-
-    - name: Install docker
-      become: yes
-      shell:  curl https://get.docker.com | bash -
-    
-    - name: Add ubuntu user to docker group
-      user:
-        name: "ubuntu"
-        group: "docker"
-        append: yes
-
-    - name: Get docker-compose
-      get_url:
-        url: https://github.com/docker/compose/releases/download/1.29.2/docker-compose-Linux-x86_64
-        dest: /usr/local/bin/docker-compose
-        mode: 'u+x,g+x'
-
     - name: Make broadcast folders
       file: 
         path: "{{ item.path }}"
diff --git a/jamulus-install.yml b/jamulus-install.yml
index 7906d57..d2b4916 100644
--- a/jamulus-install.yml
+++ b/jamulus-install.yml
@@ -5,11 +5,11 @@
     - name: Add jam user
       user:
         name: jam
-    
+        
     - name: Wait for apt to unlock
       become: yes
       shell:  while sudo fuser /var/lib/dpkg/lock >/dev/null 2>&1; do sleep 5; done;
-
+   
     - name: Install some deps
       apt:
         pkg:
@@ -19,28 +19,6 @@
         state: latest
         update_cache: true
 
-    - name: Get node exporter
-      get_url:
-        url: https://github.com/prometheus/node_exporter/releases/download/v1.2.2/node_exporter-1.2.2.linux-amd64.tar.gz
-        dest: /tmp/node_exporter-1.2.2.linux-amd64.tar.gz
-
-    - name: Extract node exporter
-      unarchive:
-        src: /tmp/node_exporter-1.2.2.linux-amd64.tar.gz
-        dest: /tmp/
-        remote_src: yes
-
-    - name: Install node exporter
-      copy: 
-        remote_src: yes
-        src: /tmp/node_exporter-1.2.2.linux-amd64/node_exporter
-        dest: /usr/local/bin/node_exporter
-
-    - name: Move node exporter service file
-      copy:
-        src: "{{ playbook_dir }}/payload/init.d/node_exporter.service"
-        dest: /lib/systemd/system/node_exporter.service
-
     - name: Get jamulus
       get_url:
         url: https://github.com/jamulussoftware/jamulus/releases/download/r3_9_1/jamulus-headless_3.9.1_ubuntu_amd64.deb
@@ -55,11 +33,6 @@
         src: "{{ playbook_dir }}/payload/init.d/jamulus.service"
         dest: /lib/systemd/system/jamulus.service
       
-    - name: Start node exporter service
-      systemd:
-        state: started
-        name: node_exporter.service
-
     - name: Start Jamulus service
       systemd:
         state: started
diff --git a/main.tf b/main.tf
index 42a95f9..974f617 100644
--- a/main.tf
+++ b/main.tf
@@ -37,10 +37,10 @@ resource "aws_instance" "jamulus" {
 
 data "aws_ami" "image" {
   most_recent = true
-  owners      = ["099720109477"]
+  owners      = ["self"]
   filter {
     name   = "name"
-    values = ["ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-*"]
+    values = ["vlp-*"]
   }
 }