diff --git a/Docker/RabbitMQ/Dockerfile b/Docker/RabbitMQ/Dockerfile
index 8df69bea37..69f2533c30 100644
--- a/Docker/RabbitMQ/Dockerfile
+++ b/Docker/RabbitMQ/Dockerfile
@@ -1,12 +1,12 @@
-FROM rabbitmq:3-management
+FROM rabbitmq:3.8-management
 
 RUN apt-get update
 
 RUN apt-get install -y curl && apt-get install -y zip
 
-RUN curl -O https://dl.bintray.com/rabbitmq/community-plugins/3.7.x/rabbitmq_delayed_message_exchange/rabbitmq_delayed_message_exchange-20171201-3.7.x.zip \
-&& unzip rabbitmq_delayed_message_exchange-20171201-3.7.x.zip -d $RABBITMQ_HOME/plugins \
-&& rm rabbitmq_delayed_message_exchange-20171201-3.7.x.zip
+RUN curl -O https://dl.bintray.com/rabbitmq/community-plugins/3.8.x/rabbitmq_delayed_message_exchange/rabbitmq_delayed_message_exchange-20191008-3.8.x.zip\
+&& unzip rabbitmq_delayed_message_exchange-20191008-3.8.x.zip -d $RABBITMQ_HOME/plugins \
+&& rm rabbitmq_delayed_message_exchange-20191008-3.8.x.zip
 
 RUN rabbitmq-plugins enable --offline rabbitmq_delayed_message_exchange
 
diff --git a/appveyor.yml b/appveyor.yml
index 29bcd2164b..4f95305ef8 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,8 +1,18 @@
-version: 8.0.{build}
+version: 8.1.{build}
 image: Ubuntu1804
 configuration: Release
 stack: jdk 11
 
+services: 
+- docker 
+install: 
+- sudo curl -L "https://github.com/docker/compose/releases/download/1.24.1/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose 
+- sudo chmod +x /usr/local/bin/docker-compose 
+- wget -q https://packages.microsoft.com/config/ubuntu/16.04/packages-microsoft-prod.deb 
+- sudo dpkg -i packages-microsoft-prod.deb 
+- sudo apt-get install apt-transport-https 
+- sudo apt-get update 
+
 skip_commits:
   files:
     - '**/*.md'
@@ -20,10 +30,9 @@ dotnet_csproj:
 environment:
   Sql__TestsBrighterConnectionString: Server=localhost;Database=BrighterTests;User ID=sa;Password=Password123!;Application Name=BrighterTests
   Sql__TestsMasterConnectionString: Server=localhost;Database=master;User ID=sa;Password=Password123!;Application Name=BrighterTests
-install:
-- sh: >-
-    sudo snap install docker
 
+before_build:
+- sh: >-
     docker-compose up -d
 
     java --version