diff --git a/.swift-version b/.swift-version
index a1ef0ca..a75b92f 100644
--- a/.swift-version
+++ b/.swift-version
@@ -1 +1 @@
-5.0.2
+5.1
diff --git a/.travis.yml b/.travis.yml
index 478e699..306dee7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,24 +31,22 @@ matrix:
       sudo: required
       services: docker
       # Note: Ubuntu 16.04
-      env: DOCKER_IMAGE=swift:5.0.2-xenial
-    - os: linux
-      dist: xenial
-      sudo: required
-      services: docker
-      # Note: Kitura-WebSocket-NIO requires zlib
-      env: DOCKER_IMAGE=swift:5.0.2-xenial KITURA_NIO=1 DOCKER_PACKAGES="libz-dev"
+      env: DOCKER_IMAGE=swift:5.0.3-xenial SWIFT_SNAPSHOT=5.0.3
     - os: linux
       dist: xenial
       sudo: required
       services: docker
       # Note: Ubuntu 18.04
-      env: DOCKER_IMAGE=swift:5.0.2 SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT
+      env: DOCKER_IMAGE=swift:5.1
     - os: linux
       dist: xenial
       sudo: required
       services: docker
-      env: DOCKER_IMAGE=swift:5.0.2 SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT KITURA_NIO=1 DOCKER_PACKAGES="libz-dev"
+      # Note: Kitura-WebSocket-NIO requires zlib
+      env: DOCKER_IMAGE=swift:5.1 KITURA_NIO=1 DOCKER_PACKAGES="libz-dev"
+      # Disabling snapshot due to crash during compilation (2019-09-30-a)
+      # TODO: re-enable once dev snapshots are functioning
+      #SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT 
     - os: osx
       osx_image: xcode9.2
       sudo: required
@@ -65,18 +63,16 @@ matrix:
       osx_image: xcode10.2
       sudo: required
       env: SWIFT_SNAPSHOT=5.0.1 JAZZY_ELIGIBLE=true
-    - os: osx
-      osx_image: xcode10.2
-      sudo: required
-      env: SWIFT_SNAPSHOT=5.0.1 KITURA_NIO=1
     - os: osx
       osx_image: xcode11
       sudo: required
-      env: SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT
     - os: osx
       osx_image: xcode11
       sudo: required
-      env: SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT KITURA_NIO=1
+      env: KITURA_NIO=1
+      # Disabling snapshot due to crash during compilation (2019-09-30-a)
+      # TODO: re-enable once dev snapshots are functioning
+      #SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT 
 
 before_install:
   - git clone https://github.com/IBM-Swift/Package-Builder.git
diff --git a/Package.swift b/Package.swift
index c7b8d8d..846f01b 100644
--- a/Package.swift
+++ b/Package.swift
@@ -44,8 +44,10 @@ var targetDependencies: [Target.Dependency] = [ "Kitura", "CloudEnvironment","Sw
 // targetDependencies.append("SwiftKueryPostgreSQL")
 
 // IBMCloudAppID requires OpenSSL that is not included on Mac by default.
+// We only include the appid example on Linux to ensure Kitura-Sample works
+// out-of-the-box on macOS.
 #if os(Linux)
-dependencies.append(.package(url: "https://github.com/ibm-cloud-security/appid-serversdk-swift", from: "5.1.0"))
+dependencies.append(.package(url: "https://github.com/ibm-cloud-security/appid-serversdk-swift", from: "6.0.0"))
 targetDependencies.append("IBMCloudAppID")
 #endif
 
diff --git a/Package@swift-4.swift b/Package@swift-4.swift
index df44c7c..a8aa487 100644
--- a/Package@swift-4.swift
+++ b/Package@swift-4.swift
@@ -44,8 +44,10 @@ var targetDependencies: [Target.Dependency] = [ "Kitura", "CloudEnvironment","Sw
 // targetDependencies.append("SwiftKueryPostgreSQL")
 
 // IBMCloudAppID requires OpenSSL that is not included on Mac by default.
+// We only include the appid example on Linux to ensure Kitura-Sample works
+// out-of-the-box on macOS.
 #if os(Linux) && swift(>=4.2)
-dependencies.append(.package(url: "https://github.com/ibm-cloud-security/appid-serversdk-swift", from: "5.1.0"))
+dependencies.append(.package(url: "https://github.com/ibm-cloud-security/appid-serversdk-swift", from: "6.0.0"))
 targetDependencies.append("IBMCloudAppID")
 #endif