diff --git a/README.md b/README.md
index ff769479c52a0c98f2758c486838fb0d55f9d77e..dcb5588a60e7b35ec6fe867847a4b0ea75a5a4dd 100644
--- a/README.md
+++ b/README.md
@@ -18,11 +18,17 @@ cd epics
 
 ## Dependencies
 
+### Ubuntu
+
 Should be installed by `bootstrap_epics`
 ```
 sudo apt-get install re2c  libreadline-dev
 ```
 
+### libXp
+
+https://askubuntu.com/questions/944838/libxp-so-6-missing-for-ubuntu-17-04
+
 ## IOCs
 
 ### Python IOC
@@ -40,4 +46,23 @@ wget https://epics.anl.gov/bcda/synApps/tar/synApps_6_0.tar.gz
 ```
 
 
+### Synapps fix
+
+#### asyn/stream headers
 
+
+In `asyn/include`, `stream/include`
+```
+sed -i \
+     -e 's|epicsShareFunc|DBCORE_API|g' \
+     -e 's|epicsShareClass|DBCORE_API|g' \
+     -e 's|epicsShareExtern|DBCORE_API extern|g' \
+     -e 's|epicsShareDef\s*||g' \
+     -e 's|shareLib\.h|dbCoreAPI.h|g' \
+     -e 's|epicsShareAPI|epicsStdCall|g' \
+     -e '/#define\s*epicsExportSharedSymbols/d' *.h
+```
+     
+Also include the `.c` and `.cc` files in `stream/src`
+     
+     
diff --git a/bin/bootstrap_epics b/bin/bootstrap_epics
index 8ce7b414fc2754419e6de31899801af2b40bf86d..0d6d771d9916c6a7cd670d763e613b4d3761a865 100755
--- a/bin/bootstrap_epics
+++ b/bin/bootstrap_epics
@@ -88,7 +88,7 @@ if [[ $?  ]] ; then
   if [[ "$?" == "0" ]] ; then 
     sudo apt-get install -y \
       re2c  libreadline-dev libusb-dev \
-      libusb-java libusb-1.0-0-dev libnet1-dev \
+      libusb-java libusb-1.0-0-dev libnet1-dev  libavl-dev \
       python-pip \
       libpcap-dev libx11-dev libxext-dev python-numpy
     if [[ "$(uname -m)" == "aarch64" ]] ; then
diff --git a/bin/phoebus b/bin/phoebus
index 48b8caf496998c6c627455d5aca209b47553ae3a..f4c1950b005d9215e696ada9dd1754eaed9780e7 100755
--- a/bin/phoebus
+++ b/bin/phoebus
@@ -4,7 +4,7 @@
 
 # When deploying, change "TOP"
 # to the absolute installation path
-TOP="/opt/epics/css/phoebus-4.6.0"
+TOP="/opt/epics/css/phoebus-4.6.6"
 
 # Ideally, assert that Java is found
 # export JAVA_HOME=/opt/jdk-9
diff --git a/css/settings.ini b/css/settings.ini
new file mode 100644
index 0000000000000000000000000000000000000000..b2191ed29c250842c8753c5e42b4e21bab2bbdce
--- /dev/null
+++ b/css/settings.ini
@@ -0,0 +1,6 @@
+
+# Self-update
+org.phoebus.applications.update/current_version=2022-02-09 23:59
+org.phoebus.applications.update/update_url=https://controlssoftware.sns.ornl.gov/css_phoebus/nightly/phoebus-$(arch).zip
+org.csstudio.trends.databrowser3/archives=pbraw://10.10.241.20:17668/retrieval|sodium
+org.csstudio.trends.databrowser3/urls=pbraw://10.10.241.20:17668/retrieval
diff --git a/setup.sh b/setup.sh
index 69572aff8e50b000c08bcd36487ae245b6f5456f..6b13eda57232e0d5177556b506f01cc56a263741 100644
--- a/setup.sh
+++ b/setup.sh
@@ -7,6 +7,8 @@ export EPICS_BASE=/opt/epics/base
 
 if [[ "aarch64" == "$(uname -m)" ]] ; then
 export EPICS_HOST_ARCH=linux-arm
+elif [[ "armv7l" == "$(uname -m)" ]] ; then
+export EPICS_HOST_ARCH=linux-arm
 else
 export EPICS_HOST_ARCH=linux-x86_64
 fi