diff --git a/.github/workflows/lv_sim.yml b/.github/workflows/lv_sim.yml
index 951b3c8d..503f5780 100644
--- a/.github/workflows/lv_sim.yml
+++ b/.github/workflows/lv_sim.yml
@@ -7,12 +7,10 @@ on:
     branches: [ master, develop ]
     paths-ignore:
       - 'doc/**'
-      - 'images/**'
   pull_request:
     branches: [ develop ]
     paths-ignore:
       - 'doc/**'
-      - 'images/**'
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 69cdb715..45aac7ca 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -10,12 +10,10 @@ on:
     branches: [ master, develop ]
     paths-ignore:
       - 'doc/**'
-      - 'images/**'
   pull_request:
     branches: [ develop ]
     paths-ignore:
       - 'doc/**'
-      - 'images/**'
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
diff --git a/README.md b/README.md
index 7c52cb44..e886bb09 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 [![Build PineTime Firmware](https://github.com/InfiniTimeOrg/InfiniTime/workflows/Build%20PineTime%20Firmware/badge.svg?branch=master)](https://github.com/InfiniTimeOrg/InfiniTime/actions)
 
-![InfiniTime logo](images/infinitime-logo-small.jpg "InfiniTime Logo")
+![InfiniTime logo](doc/logo/infinitime-logo-small.jpg "InfiniTime Logo")
 
 Fast open-source firmware for the [PineTime smartwatch](https://www.pine64.org/pinetime/) with many features, written in modern C++.
 
diff --git a/images/infinitime-logo-small.jpg b/doc/logo/infinitime-logo-small.jpg
similarity index 100%
rename from images/infinitime-logo-small.jpg
rename to doc/logo/infinitime-logo-small.jpg
diff --git a/images/infinitime-logo.jpg b/doc/logo/infinitime-logo.jpg
similarity index 100%
rename from images/infinitime-logo.jpg
rename to doc/logo/infinitime-logo.jpg
diff --git a/doc/openOCD.md b/doc/openOCD.md
index df24b30b..ef0f6605 100644
--- a/doc/openOCD.md
+++ b/doc/openOCD.md
@@ -99,7 +99,7 @@ openocd -f ./openocd-stlink.ocd -f ./flash_graphics.ocd
 
 ## Connect the STLinkV2 to the PineTime
 Here is an example using the pogo pins:
-![SWD pinout](../images/swd_pinout.jpg)
-![Pogo pins](../images/pogopins.jpg)
+![SWD pinout](openOCD/swd_pinout.jpg)
+![Pogo pins](openOCD/pogopins.jpg)
 
 You can find more information about the SWD wiring [on the wiki](https://wiki.pine64.org/index.php?title=PineTime_devkit_wiring).
diff --git a/images/pogopins.jpg b/doc/openOCD/pogopins.jpg
similarity index 100%
rename from images/pogopins.jpg
rename to doc/openOCD/pogopins.jpg
diff --git a/images/swd_pinout.jpg b/doc/openOCD/swd_pinout.jpg
similarity index 100%
rename from images/swd_pinout.jpg
rename to doc/openOCD/swd_pinout.jpg
diff --git a/images/0.14.0/collage1.png b/images/0.14.0/collage1.png
deleted file mode 100644
index fd5f27ba..00000000
Binary files a/images/0.14.0/collage1.png and /dev/null differ
diff --git a/images/0.14.0/collage2.png b/images/0.14.0/collage2.png
deleted file mode 100644
index 293147dd..00000000
Binary files a/images/0.14.0/collage2.png and /dev/null differ
diff --git a/images/0.7.0/montage.jpg b/images/0.7.0/montage.jpg
deleted file mode 100644
index 81716cc9..00000000
Binary files a/images/0.7.0/montage.jpg and /dev/null differ
diff --git a/images/1.0.0/collage.png b/images/1.0.0/collage.png
deleted file mode 100644
index b9ffaa88..00000000
Binary files a/images/1.0.0/collage.png and /dev/null differ
diff --git a/images/pinetime.jpg b/images/pinetime.jpg
deleted file mode 100644
index 7f729fa5..00000000
Binary files a/images/pinetime.jpg and /dev/null differ
diff --git a/images/pinetimestub1.jpg b/images/pinetimestub1.jpg
deleted file mode 100644
index 3ebc34e5..00000000
Binary files a/images/pinetimestub1.jpg and /dev/null differ
diff --git a/images/v0.3.0.png b/images/v0.3.0.png
deleted file mode 100644
index 4a2bcdd2..00000000
Binary files a/images/v0.3.0.png and /dev/null differ
diff --git a/images/v0.3.0/Gauge.jpg b/images/v0.3.0/Gauge.jpg
deleted file mode 100644
index aa12a01c..00000000
Binary files a/images/v0.3.0/Gauge.jpg and /dev/null differ
diff --git a/images/v0.3.0/Helloworld.jpg b/images/v0.3.0/Helloworld.jpg
deleted file mode 100644
index b3b09009..00000000
Binary files a/images/v0.3.0/Helloworld.jpg and /dev/null differ
diff --git a/images/v0.3.0/Meter.jpg b/images/v0.3.0/Meter.jpg
deleted file mode 100644
index a2c28e14..00000000
Binary files a/images/v0.3.0/Meter.jpg and /dev/null differ
diff --git a/images/v0.3.0/Version.jpg b/images/v0.3.0/Version.jpg
deleted file mode 100644
index d126d741..00000000
Binary files a/images/v0.3.0/Version.jpg and /dev/null differ
diff --git a/images/v0.3.0/Watchface.jpg b/images/v0.3.0/Watchface.jpg
deleted file mode 100644
index 1cfaa976..00000000
Binary files a/images/v0.3.0/Watchface.jpg and /dev/null differ
diff --git a/images/v0.3.0/Watchface2.jpg b/images/v0.3.0/Watchface2.jpg
deleted file mode 100644
index 63783051..00000000
Binary files a/images/v0.3.0/Watchface2.jpg and /dev/null differ
diff --git a/images/v0.3.0/menu.jpg b/images/v0.3.0/menu.jpg
deleted file mode 100644
index bf94a2e5..00000000
Binary files a/images/v0.3.0/menu.jpg and /dev/null differ