diff --git a/aarch64/app/Makefile b/aarch64/app/Makefile
index 74caba9..13dca69 100644
--- a/aarch64/app/Makefile
+++ b/aarch64/app/Makefile
@@ -1 +1,23 @@
-nop:
\ No newline at end of file
+#//Version=Native
+AXIS_USABLE_LIBS = UCLIBC GLIBC
+
+PROG     = tailscale_vpn
+
+CFLAGS   += -Wall 
+
+PKGS += glib-2.0 gio-2.0
+CFLAGS += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --cflags $(PKGS))
+LDLIBS += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --libs $(PKGS))
+
+SRCS      += main.c
+OBJS      += $(SRCS:.c=.o)
+
+all: $(PROG) $(OBJS)
+
+$(PROG): $(OBJS)
+	$(CC) $^ $(CFLAGS) $(LIBS) $(LDFLAGS) -lm $(LDLIBS) -o $@
+	$(STRIP) $@
+
+clean:
+	#rm -f $(PROG) $(OBJS)
+
diff --git a/aarch64/app/Tailscale_VPN b/aarch64/app/Tailscale_VPN
index 063aa9c..d075003 100755
Binary files a/aarch64/app/Tailscale_VPN and b/aarch64/app/Tailscale_VPN differ
diff --git a/aarch64/app/app.h b/aarch64/app/app.h
new file mode 100644
index 0000000..aa6fc52
--- /dev/null
+++ b/aarch64/app/app.h
@@ -0,0 +1 @@
+#define APP_NAME "tailscale_vpn"
\ No newline at end of file
diff --git a/aarch64/app/main.c b/aarch64/app/main.c
new file mode 100644
index 0000000..75e3552
--- /dev/null
+++ b/aarch64/app/main.c
@@ -0,0 +1,43 @@
+#include <string.h>
+#include <glib.h>
+#include <glib-object.h>
+#include <glib/gprintf.h>
+#include <syslog.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "app.h"
+
+#define TAILSCALE_VPN "\
+#!/bin/sh \n\
+echo \"Starting Service\" \n\
+chmod 777 /usr/local/packages/tailscale_vpn/lib/tailscale \n\
+chmod 777 /usr/local/packages/tailscale_vpn/lib/tailscaled \n\
+/usr/local/packages/tailscale_vpn/lib/tailscaled --tun=userspace-networking --socket=/usr/local/packages/tailscale_vpn/tailscaled.sock & \n\
+echo \"Service Started\" \n\
+echo \"Scroll to Bottom for link\" \n\
+/usr/local/packages/tailscale_vpn/lib/tailscale --socket=/usr/local/packages/tailscale_vpn/tailscaled.sock up \n\
+wait \n\
+"
+
+//****************/
+/* main function */
+//****************/
+
+int main() {
+/* Loop main (keeps the app running. without this part the app will start and stop right after) */
+ GMainLoop *main_loop;
+ main_loop = g_main_loop_new(NULL, FALSE);
+
+/* LOG app name (appname) */    
+ syslog(LOG_INFO, "Starting %s", APP_NAME); 
+ g_message("Starting %s",APP_NAME);
+
+ system(TAILSCALE_VPN);
+ 
+/* calling main loop */
+ g_main_loop_run(main_loop); 
+
+//exit    
+ return 0; 
+}
diff --git a/aarch64/app/manifest.json b/aarch64/app/manifest.json
index 7726558..32abb95 100644
--- a/aarch64/app/manifest.json
+++ b/aarch64/app/manifest.json
@@ -2,7 +2,7 @@
   "schemaVersion": "1.6.0",
   "acapPackageConf": {
       "setup": {
-          "appName": "Tailscale_VPN",
+          "appName": "tailscale_vpn",
           "friendlyName": "Tailscale VPN",
           "vendor": "Tailscale - Packaged by Mo3he",
           "embeddedSdkVersion": "3.0",          
diff --git a/aarch64/app/package.conf b/aarch64/app/package.conf
new file mode 100644
index 0000000..3019d90
--- /dev/null
+++ b/aarch64/app/package.conf
@@ -0,0 +1,22 @@
+PACKAGENAME="Tailscale VPN"
+APPTYPE="aarch64"
+APPNAME="tailscale_vpn"
+APPID=""
+LICENSENAME="Available"
+LICENSEPAGE="none"
+VENDOR="Tailscale - Packaged by Mo3he"
+REQEMBDEVVERSION="3.0"
+APPMAJORVERSION="1"
+APPMINORVERSION="63"
+APPMICROVERSION="0"
+APPGRP="sdk"
+APPUSR="sdk"
+APPOPTS=""
+OTHERFILES=""
+SETTINGSPAGEFILE="index.html"
+SETTINGSPAGETEXT=""
+VENDORHOMEPAGELINK='<a href="https://www.tailscale.com" target="_blank">www.tailscale.com</a>'
+PREUPGRADESCRIPT=""
+POSTINSTALLSCRIPT=""
+STARTMODE="once"
+HTTPCGIPATHS=""
diff --git a/aarch64/app/package.conf.orig b/aarch64/app/package.conf.orig
new file mode 100644
index 0000000..4b174ca
--- /dev/null
+++ b/aarch64/app/package.conf.orig
@@ -0,0 +1,10 @@
+APPNAME="tailscale_vpn"
+PACKAGENAME="Tailscale VPN"
+VENDOR="Tailscale - Packaged by Mo3he"
+REQEMBDEVVERSION="3.0"
+VENDORHOMEPAGELINK='<a href="https://www.tailscale.com" target="_blank">www.tailscale.com</a>'
+STARTMODE="once"
+APPMAJORVERSION="1"
+APPMINORVERSION="63"
+APPMICROVERSION="0"
+SETTINGSPAGEFILE="index.html"
diff --git a/aarch64/app/param.conf b/aarch64/app/param.conf
new file mode 100644
index 0000000..e69de29
diff --git a/arm/app/Makefile b/arm/app/Makefile
index 74caba9..13dca69 100644
--- a/arm/app/Makefile
+++ b/arm/app/Makefile
@@ -1 +1,23 @@
-nop:
\ No newline at end of file
+#//Version=Native
+AXIS_USABLE_LIBS = UCLIBC GLIBC
+
+PROG     = tailscale_vpn
+
+CFLAGS   += -Wall 
+
+PKGS += glib-2.0 gio-2.0
+CFLAGS += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --cflags $(PKGS))
+LDLIBS += $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --libs $(PKGS))
+
+SRCS      += main.c
+OBJS      += $(SRCS:.c=.o)
+
+all: $(PROG) $(OBJS)
+
+$(PROG): $(OBJS)
+	$(CC) $^ $(CFLAGS) $(LIBS) $(LDFLAGS) -lm $(LDLIBS) -o $@
+	$(STRIP) $@
+
+clean:
+	#rm -f $(PROG) $(OBJS)
+
diff --git a/arm/app/Tailscale_VPN b/arm/app/Tailscale_VPN
index 063aa9c..a5eea3a 100755
Binary files a/arm/app/Tailscale_VPN and b/arm/app/Tailscale_VPN differ
diff --git a/arm/app/app.h b/arm/app/app.h
new file mode 100644
index 0000000..aa6fc52
--- /dev/null
+++ b/arm/app/app.h
@@ -0,0 +1 @@
+#define APP_NAME "tailscale_vpn"
\ No newline at end of file
diff --git a/arm/app/main.c b/arm/app/main.c
new file mode 100644
index 0000000..75e3552
--- /dev/null
+++ b/arm/app/main.c
@@ -0,0 +1,43 @@
+#include <string.h>
+#include <glib.h>
+#include <glib-object.h>
+#include <glib/gprintf.h>
+#include <syslog.h>
+#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "app.h"
+
+#define TAILSCALE_VPN "\
+#!/bin/sh \n\
+echo \"Starting Service\" \n\
+chmod 777 /usr/local/packages/tailscale_vpn/lib/tailscale \n\
+chmod 777 /usr/local/packages/tailscale_vpn/lib/tailscaled \n\
+/usr/local/packages/tailscale_vpn/lib/tailscaled --tun=userspace-networking --socket=/usr/local/packages/tailscale_vpn/tailscaled.sock & \n\
+echo \"Service Started\" \n\
+echo \"Scroll to Bottom for link\" \n\
+/usr/local/packages/tailscale_vpn/lib/tailscale --socket=/usr/local/packages/tailscale_vpn/tailscaled.sock up \n\
+wait \n\
+"
+
+//****************/
+/* main function */
+//****************/
+
+int main() {
+/* Loop main (keeps the app running. without this part the app will start and stop right after) */
+ GMainLoop *main_loop;
+ main_loop = g_main_loop_new(NULL, FALSE);
+
+/* LOG app name (appname) */    
+ syslog(LOG_INFO, "Starting %s", APP_NAME); 
+ g_message("Starting %s",APP_NAME);
+
+ system(TAILSCALE_VPN);
+ 
+/* calling main loop */
+ g_main_loop_run(main_loop); 
+
+//exit    
+ return 0; 
+}
diff --git a/arm/app/package.conf b/arm/app/package.conf
new file mode 100644
index 0000000..3191451
--- /dev/null
+++ b/arm/app/package.conf
@@ -0,0 +1,22 @@
+PACKAGENAME="Tailscale VPN"
+APPTYPE="armv7hf"
+APPNAME="Tailscale_VPN"
+APPID=""
+LICENSENAME="Available"
+LICENSEPAGE="none"
+VENDOR="Tailscale - Packaged by Mo3he"
+REQEMBDEVVERSION="3.0"
+APPMAJORVERSION="1"
+APPMINORVERSION="63"
+APPMICROVERSION="0"
+APPGRP="sdk"
+APPUSR="sdk"
+APPOPTS=""
+OTHERFILES=""
+SETTINGSPAGEFILE="index.html"
+SETTINGSPAGETEXT=""
+VENDORHOMEPAGELINK='<a href="https://www.tailscale.com" target="_blank">www.tailscale.com</a>'
+PREUPGRADESCRIPT=""
+POSTINSTALLSCRIPT=""
+STARTMODE="once"
+HTTPCGIPATHS=""
diff --git a/arm/app/package.conf.orig b/arm/app/package.conf.orig
new file mode 100644
index 0000000..7e083b9
--- /dev/null
+++ b/arm/app/package.conf.orig
@@ -0,0 +1,10 @@
+APPNAME="Tailscale_VPN"
+PACKAGENAME="Tailscale VPN"
+VENDOR="Tailscale - Packaged by Mo3he"
+REQEMBDEVVERSION="3.0"
+VENDORHOMEPAGELINK='<a href="https://www.tailscale.com" target="_blank">www.tailscale.com</a>'
+STARTMODE="once"
+APPMAJORVERSION="1"
+APPMINORVERSION="63"
+APPMICROVERSION="0"
+SETTINGSPAGEFILE="index.html"
diff --git a/arm/app/param.conf b/arm/app/param.conf
new file mode 100644
index 0000000..e69de29