diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index ab01a6fc..b1dfbd02 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -137,6 +137,11 @@ jobs:
           echo Cannot run Appium tests when build was triggered by dependabot
           exit 1  
       - uses: actions/checkout@v3
+      - name: BrowserStack Env Setup
+        uses: browserstack/github-actions/setup-env@master
+        with:
+          username: ${{ secrets.BROWSERSTACK_USERNAME }}
+          access-key: ${{ secrets.BROWSERSTACK_ACCESS_KEY }}
       - uses: actions/setup-node@v4
         if: matrix.module-name == 'openmaqs-playwright'
         with:
@@ -260,7 +265,6 @@ jobs:
         with:
           distribution: zulu
           java-version: 11
-          cache: maven
       - name: Restore Local Maven Cache
         uses: actions/cache@v3.3.1
         with:
@@ -270,7 +274,7 @@ jobs:
         uses: whelk-io/maven-settings-xml-action@v21
         with:
           profiles: '[{"id": "gpg", "properties": { "gpg.keyname": "${{secrets.GPG_KEYNAME_ID}}", "gpg.passphrase": "${{secrets.GPG_PASSPHRASE}}" }}]'
-          servers: '[{"id": "ossrh", "username": "${{secrets.DEPLOY_PACKAGE_USERNAME}}", "password": "${{secrets.DEPLOY_PACKAGE_PASSWORD}}"}]'
+          servers: '[{"id": "ossrh", "username": "${{vars.DEPLOY_PACKAGE_USERNAME}}", "password": "${{secrets.DEPLOY_PACKAGE_PASSWORD}}"}]'
           active_profiles: >
             [ "ossrh", "release", "gpg" ]
       - name: Import GPG key
diff --git a/openmaqs-appium/browserstack.yml b/openmaqs-appium/browserstack.yml
new file mode 100644
index 00000000..b45cffb3
--- /dev/null
+++ b/openmaqs-appium/browserstack.yml
@@ -0,0 +1,12 @@
+framework: testng
+platforms:
+  - deviceName: Google Pixel 7 Pro
+    osVersion: 13.0
+    browserName: android
+    deviceOrientation: portrait
+parallelsPerPlatform: 5
+browserstackLocal: false
+buildIdentifier: ${BUILD_NUMBER}
+debug: true
+networkLogs: false
+consoleLogs: errors
\ No newline at end of file
diff --git a/openmaqs-appium/config.xml b/openmaqs-appium/config.xml
index 14607a7d..522b6d5c 100644
--- a/openmaqs-appium/config.xml
+++ b/openmaqs-appium/config.xml
@@ -39,7 +39,7 @@
         <DeviceName>Android GoogleAPI Emulator</DeviceName>
 
         <!-- Appium or grid connection -->
-        <MobileHubUrl>http://ondemand.saucelabs.com:80/wd/hub</MobileHubUrl>
+        <MobileHubUrl>https://hub.browserstack.com/wd/hub</MobileHubUrl>
 
         <!-- Command time-out in milliseconds -->
         <MobileCommandTimeout>122000</MobileCommandTimeout>
diff --git a/openmaqs-appium/pom.xml b/openmaqs-appium/pom.xml
index 6117bde7..523ecb44 100644
--- a/openmaqs-appium/pom.xml
+++ b/openmaqs-appium/pom.xml
@@ -67,4 +67,56 @@
             <scope>compile</scope>
         </dependency>
     </dependencies>
+    <profiles>
+        <profile>
+            <id>testing</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <version>3.3.0</version>
+                        <executions>
+                            <execution>
+                                <id>getClasspathFilenames</id>
+                                <goals>
+                                    <goal>properties</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <version>${surefire.plugin.version}</version>
+                        <configuration>
+                            <parallel>methods</parallel>
+                            <threadCount>5</threadCount>
+                            <argLine>
+                                ${argLine} -javaagent:@{com.browserstack:browserstack-java-sdk:jar}
+                            </argLine>
+                        </configuration>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.apache.maven.surefire</groupId>
+                                <artifactId>surefire-testng</artifactId>
+                                <version>${surefire.plugin.version}</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                </plugins>
+            </build>
+            <dependencies>
+                <dependency>
+                    <groupId>com.browserstack</groupId>
+                    <artifactId>browserstack-java-sdk</artifactId>
+                    <version>1.2.1</version>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+
 </project>
diff --git a/openmaqs-selenium/browserstack.yml b/openmaqs-selenium/browserstack.yml
new file mode 100644
index 00000000..e863ecee
--- /dev/null
+++ b/openmaqs-selenium/browserstack.yml
@@ -0,0 +1,12 @@
+framework: testng
+platforms:
+  - os: Windows
+    osVersion: 11
+    browserName: Chrome
+    browserVersion: latest
+parallelsPerPlatform: 5
+browserstackLocal: false
+buildIdentifier: ${BUILD_NUMBER}
+debug: true
+networkLogs: false
+consoleLogs: errors
\ No newline at end of file
diff --git a/openmaqs-selenium/config.xml b/openmaqs-selenium/config.xml
index 533810ee..2bd394bb 100644
--- a/openmaqs-selenium/config.xml
+++ b/openmaqs-selenium/config.xml
@@ -39,17 +39,17 @@
         <Browser>Firefox</Browser>
         <Browser>Edge</Browser>
         <Browser>HEADLESSCHROME</Browser>-->
-        <Browser>HEADLESSCHROME</Browser>
+        <Browser>REMOTE</Browser>
 
         <!--Remote browser settings-->
         <RemoteBrowser>Chrome</RemoteBrowser>
-        <HubUrl>http://ondemand.saucelabs.com:80/wd/hub</HubUrl>
+        <HubUrl>https://hub.browserstack.com/wd/hub</HubUrl>
         <WebSiteBase>https://openmaqs.github.io/TestingSite/Automation/</WebSiteBase>
         <BrowserWaitTime>1000</BrowserWaitTime>
         <BrowserTimeout>20000</BrowserTimeout>
         <RemoteBrowserName>Chrome</RemoteBrowserName>
-        <RemotePlatform>OS X 10.11</RemotePlatform>
-        <RemoteVersion>54.0</RemoteVersion>
+        <!--        <RemotePlatform>OS X 10.11</RemotePlatform>-->
+        <!--        <RemoteVersion>54.0</RemoteVersion>-->
 
         <!--Browser Resize settings
         <BrowserSize>MAXIMIZE</BrowserSize>
@@ -62,10 +62,5 @@
     </SeleniumMaqs>
 
     <RemoteSeleniumCapsMaqs>
-        <username>Sauce_Labs_Username</username>
-        <accessKey>Sauce_Labs_Accesskey</accessKey>
-        <browserName>Chrome</browserName>
-        <platform>OS X 10.11</platform>
-        <version>54.0</version>
     </RemoteSeleniumCapsMaqs>
 </configuration>
\ No newline at end of file
diff --git a/openmaqs-selenium/pom.xml b/openmaqs-selenium/pom.xml
index 6a117a72..897e7e0e 100644
--- a/openmaqs-selenium/pom.xml
+++ b/openmaqs-selenium/pom.xml
@@ -1,4 +1,6 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -18,6 +20,51 @@
         <commonsio.version>2.11.0</commonsio.version>
     </properties>
 
+    <profiles>
+        <profile>
+            <id>testing</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <version>3.3.0</version>
+                        <executions>
+                            <execution>
+                                <id>getClasspathFilenames</id>
+                                <goals>
+                                    <goal>properties</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <version>${surefire.plugin.version}</version>
+                        <configuration>
+                            <parallel>methods</parallel>
+                            <threadCount>5</threadCount>
+                            <argLine>
+                                ${argLine} -javaagent:@{com.browserstack:browserstack-java-sdk:jar}
+                            </argLine>
+                        </configuration>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.apache.maven.surefire</groupId>
+                                <artifactId>surefire-testng</artifactId>
+                                <version>${surefire.plugin.version}</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
     <dependencies>
         <dependency>
             <groupId>io.github.openmaqs.utilities</groupId>
@@ -95,5 +142,10 @@
             <version>1.7.32</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.browserstack</groupId>
+            <artifactId>browserstack-java-sdk</artifactId>
+            <version>1.2.1</version>
+        </dependency>
     </dependencies>
 </project>