diff --git a/CLIENT_DATA/AdobeAIR_7zip_config.txt b/CLIENT_DATA/AdobeAIR_7zip_config.txt
index 181b27c..74b48c6 100644
--- a/CLIENT_DATA/AdobeAIR_7zip_config.txt
+++ b/CLIENT_DATA/AdobeAIR_7zip_config.txt
@@ -1,6 +1,6 @@
 ;!@Install@!UTF-8!
-RunProgram="air17-0_win.exe -silent -eulaAccepted"
-ExtractTitle="Geos One Adobe Air 17.x Installer"
-ExtractDialogText="Extracting Adobe AIR 17.x"
+RunProgram="air_win.exe -silent -eulaAccepted"
+ExtractTitle="Geos One Adobe Air Installer"
+ExtractDialogText="Extracting Adobe AIR"
 GUIMode="1"
 ;!@InstallEnd@!
diff --git a/air_17.0.0.172_win.exe.sha1sum b/air_17.0.0.172_win.exe.sha1sum
deleted file mode 100644
index 6a6ba20..0000000
--- a/air_17.0.0.172_win.exe.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-3af3bcf6145d4ebca19d7f8b4cd11ee21b67f734  /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.2.1.1/X86/air_17.0.0.172_win.exe
diff --git a/air_18.0.0.144_win.exe.sha1sum b/air_18.0.0.144_win.exe.sha1sum
new file mode 100644
index 0000000..2628965
--- /dev/null
+++ b/air_18.0.0.144_win.exe.sha1sum
@@ -0,0 +1 @@
+d0c7844f0d455599c073063abf6a5feca79a64f1  /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.2.1.1/X86/air_18.0.0.144_win.exe
diff --git a/builder-product.cfg b/builder-product.cfg
index 13fe874..55de41b 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -29,8 +29,8 @@ CREATENEWSEREBY="1"
 # Adobe Air Verison
 # ==================================
 
-AIRVERSION="17.0.0.172"
-AIRMAJOR="17.0"
+AIRVERSION="18.0.0.144"
+AIRMAJOR="18.0"
 
 # ==================================
 # Update Java 7/8
@@ -51,8 +51,8 @@ JRE8VERSION="8.0.45.14"
 # ==================================
 
 FLASHUPDATE="1"
-FLASHVERSION="17.0.0.188"
-FLASHAXVERSION="17.0.0.188"
+FLASHVERSION="18.0.0.160"
+FLASHAXVERSION="18.0.0.160"
 
 # ==================================
 # Update Adobe Schockave
diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh
index 1f8286a..3a567ea 100644
--- a/builder-targets-cb.sh
+++ b/builder-targets-cb.sh
@@ -145,7 +145,7 @@ function create() {
   # integrate Adobe AIR
   # ==========================================================================================================
   
-  mv -v $INST_DIR/CLIENT_DATA/X86/air_${AIRVERSION}_win.exe $INST_DIR/CLIENT_DATA/Install/Packages/Air/air17-0_win.exe
+  mv -v $INST_DIR/CLIENT_DATA/X86/air_${AIRVERSION}_win.exe $INST_DIR/CLIENT_DATA/Install/Packages/Air/air_win.exe
   mv -v $INST_DIR/CLIENT_DATA/AdobeAIR_package.xml $INST_DIR/CLIENT_DATA/Install/Packages/Air/package.xml
   mv -v $INST_DIR/CLIENT_DATA/AdobeAIR_7zip_config.txt $INST_DIR/CLIENT_DATA/Install/Packages/Air/7zip_config.txt
   sed -e 's/.*<\/settings>.*/\t<set component="AdobeAir" checked="0" \/>\n&/' -i $INST_DIR/CLIENT_DATA/Config/WinPKG.xml
@@ -155,9 +155,9 @@ function create() {
   
   
   # Adobe AIR Installer not working very good from network share so create a sfx file that places the installer into a temp and let it run locally
-  7z a $INST_DIR/CLIENT_DATA/Install/Packages/Air/AdobeAIR.7z $INST_DIR/CLIENT_DATA/Install/Packages/Air/air17-0_win.exe
+  7z a $INST_DIR/CLIENT_DATA/Install/Packages/Air/AdobeAIR.7z $INST_DIR/CLIENT_DATA/Install/Packages/Air/air_win.exe
   cat $INST_DIR/CLIENT_DATA/X86/7ZipSFX/7zsd_All.sfx $INST_DIR/CLIENT_DATA/Install/Packages/Air/7zip_config.txt $INST_DIR/CLIENT_DATA/Install/Packages/Air/AdobeAIR.7z > $INST_DIR/CLIENT_DATA/Install/Packages/Air/AdobeAIR.exe
-  rm $INST_DIR/CLIENT_DATA/Install/Packages/Air/air17-0_win.exe $INST_DIR/CLIENT_DATA/Install/Packages/Air/7zip_config.txt $INST_DIR/CLIENT_DATA/Install/Packages/Air/AdobeAIR.7z
+  rm $INST_DIR/CLIENT_DATA/Install/Packages/Air/air_win.exe $INST_DIR/CLIENT_DATA/Install/Packages/Air/7zip_config.txt $INST_DIR/CLIENT_DATA/Install/Packages/Air/AdobeAIR.7z
   
   # ==========================================================================================================
   # Update Java
diff --git a/install_flash_player-17.0.0.188.exe.sha1sum b/install_flash_player-17.0.0.188.exe.sha1sum
deleted file mode 100644
index 099810e..0000000
--- a/install_flash_player-17.0.0.188.exe.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-7b8270efc5b2d6f18cb5eabf296efe803d527810  /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.2.1.1/X86/install_flash_player-17.0.0.188.exe
diff --git a/install_flash_player-18.0.0.160.exe.sha1sum b/install_flash_player-18.0.0.160.exe.sha1sum
new file mode 100644
index 0000000..b67fd01
--- /dev/null
+++ b/install_flash_player-18.0.0.160.exe.sha1sum
@@ -0,0 +1 @@
+4ce04af899ae9377b32f9e8e7f768a771e84900d  /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.2.1.1/X86/install_flash_player-18.0.0.160.exe
diff --git a/install_flash_player_ax-17.0.0.188.exe.sha1sum b/install_flash_player_ax-17.0.0.188.exe.sha1sum
deleted file mode 100644
index dedafee..0000000
--- a/install_flash_player_ax-17.0.0.188.exe.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-99cb4f6951842fc19530ef5669b4cd6457d40162  /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.2.1.1/X86/install_flash_player_ax-17.0.0.188.exe
diff --git a/install_flash_player_ax-18.0.0.160.exe.sha1sum b/install_flash_player_ax-18.0.0.160.exe.sha1sum
new file mode 100644
index 0000000..4ad9396
--- /dev/null
+++ b/install_flash_player_ax-18.0.0.160.exe.sha1sum
@@ -0,0 +1 @@
+046a2659d0141e466f6bdd0d03bb601787f49be1  /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.2.1.1/X86/install_flash_player_ax-18.0.0.160.exe
diff --git a/uninstall_flash_player-17.0.0.188.exe.sha1sum b/uninstall_flash_player-17.0.0.188.exe.sha1sum
deleted file mode 100644
index 5460765..0000000
--- a/uninstall_flash_player-17.0.0.188.exe.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-fa9c4359d02b47ab74d10840019c0b5896c110e6  /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.2.1.1/X86/uninstall_flash_player-17.0.0.188.exe
diff --git a/uninstall_flash_player-18.0.0.160.exe.sha1sum b/uninstall_flash_player-18.0.0.160.exe.sha1sum
new file mode 100644
index 0000000..a404eb8
--- /dev/null
+++ b/uninstall_flash_player-18.0.0.160.exe.sha1sum
@@ -0,0 +1 @@
+3fbd06d1e4c9ef562757ad9fd7d8f0fad2177f8c  /home/mario.fetka/.opsi-dist-cache/sereby.aio-2.2.1.1/X86/uninstall_flash_player-18.0.0.160.exe