diff --git a/.gitignore b/.gitignore
index 2af8740d8e7b591905565ddd916f9f9c28fcc1ed..f3af6fe293238636208abbff727060f48bcf198c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,5 @@
 \#*\#
 .\#*
 *.pyc
-
+build/
+tango/build/
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c02c0d839bdf984ffd6dd9467ae65dba247bfc3a..5587e13d9ffa44229f8dab09b687e58516ba8a83 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,7 +25,7 @@ build-noarch:
   <<: *build-conda
   stage: build-noarch
   script:
-    - conda build ./conda/tango --prefix-length=80 --output-folder=dist/ --channel=http://bcu-ci.esrf.fr/stable
+    - conda build ./conda/tango --prefix-length=80 --output-folder=dist/ -c tango-controls --channel=http://bcu-ci.esrf.fr/stable
   dependencies:
     - build-linux
 
@@ -46,7 +46,7 @@ deploy-devel:
   only:
     - branches
   except:
-    - stable
+    - master
   when: manual
 
 deploy-stable:
@@ -65,4 +65,3 @@ deploy-stable:
     - linux
   only:
     - tags
-    - stable
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 814d48b902cd4233eee24d32af110b8a81f625ba..8e929f0763ee4961c18114612ed0099bc1fe3f20 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,9 +1,9 @@
 ###########################################################################
 # This file is part of LImA, a Library for Image Acquisition
 #
-#  Copyright (C) : 2009-2017
+#  Copyright (C) : 2009-2019
 #  European Synchrotron Radiation Facility
-#  BP 220, Grenoble 38043
+#  CS40220 38043 Grenoble Cedex 9
 #  FRANCE
 #
 #  Contact: lima@esrf.fr
@@ -26,8 +26,6 @@ cmake_minimum_required(VERSION 3.1)
 
 project(slsdetector)
 
-set(NAME slsdetector)
-
 # Include additional modules that are used inconditionnaly
 include(GNUInstallDirs)
 include(GenerateExportHeader)
@@ -58,11 +56,13 @@ if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
 endif()
 
 if (CAMERA_MASTER_PROJECT)
-  find_package(Lima REQUIRED)
+  find_package(Lima REQUIRED COMPONENTS devel tools)
 endif()
 
 # CMake additional macros
-set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${LIMA_CMAKE_INCLUDE_DIRS} ${CMAKE_MODULE_PATH})
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${LIMA_CMAKE_INCLUDE_DIRS} ${CMAKE_MODULE_PATH})
+
+include(LimaTools)
 
 # Set version
 include(project_version)
@@ -70,31 +70,11 @@ include(project_version)
 # Enable python binding code compilation using sip generator
 if (CAMERA_MASTER_PROJECT)
   option(LIMA_ENABLE_PYTHON "compile python binding code?" OFF)
-endif()
+  option(LIMA_ENABLE_PYTANGO_SERVER "install python tango server?" OFF)
 
-if (LIMA_ENABLE_PYTHON)
-  # Find python interpreter and libs
-  find_package(PythonInterp)
-  find_package(PythonLibs)
-  if(${PYTHONINTERP_FOUND})
-    # python site-packages folder
-    execute_process(
-      COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())"
-      OUTPUT_VARIABLE _PYTHON_SITE_PACKAGES_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+  if (LIMA_ENABLE_PYTHON)
+    limatools_find_python_and_sip()
   endif()
-
-  set(PYTHON_SITE_PACKAGES_DIR ${_PYTHON_SITE_PACKAGES_DIR} CACHE PATH "where should python modules be installed?")
-
-  find_package(SIP REQUIRED)
-  include(SIPMacros)
-  if(WIN32)
-    set(SIP_TAGS WIN32_PLATFORM)
-  elseif(UNIX)
-    set(SIP_TAGS POSIX_PLATFORM)
-  endif(WIN32)
-  set(SIP_EXTRA_OPTIONS -e -g)
-
-  find_package(NumPy REQUIRED)
 endif()
 
 # Additional packages
@@ -160,7 +140,6 @@ target_link_libraries(slsdetector
 
 # Binding code for python
 if(LIMA_ENABLE_PYTHON)
-  include(LimaTools)
   limatools_run_sip_for_camera(slsdetector)
 endif()
 
@@ -202,7 +181,10 @@ if(LIMA_ENABLE_PYTHON)
   install(
     DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/python/
     DESTINATION "${PYTHON_SITE_PACKAGES_DIR}/Lima/SlsDetector"
-  )
+    )
+  if (LIMA_ENABLE_PYTANGO_SERVER)
+    add_subdirectory(tango)
+  endif()
 endif()
 
 ## Tests
diff --git a/README.md b/README.md
index 8d6f44c6c287c72d4cb9987610d672e0788864fc..734b35983846f58fad137fa4bec9b2bec16891cd 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ conda install -c esrf-bcu lima-camera-slsdetector
 
 ### Camera tango device server
 
-conda install -c esrf-bcu lima-camera-slsdetector-tango
+conda install -c tango-controls -c esrf-bcu lima-camera-slsdetector-tango
 
 # LImA
 
@@ -26,5 +26,6 @@ Lima is a C++ library which can be used with many different cameras. The library
 
 ## Documentation
 
-The documentation is available [here](https://lima1.readthedocs.io/)
+The documentation is available [here](https://lima.blissgarden.org)
+
 
diff --git a/conda/camera/meta.yaml b/conda/camera/meta.yaml
index d6602ad3a48989b2a77ab9091369d032a2d578a6..fcf13b2c0e55901ca3621e2b7e86a9d9b4c60db8 100644
--- a/conda/camera/meta.yaml
+++ b/conda/camera/meta.yaml
@@ -1,4 +1,9 @@
-{% set version = GIT_DESCRIBE_TAG[1:] %}
+# Strip the 'v' from the version tag
+{% if GIT_DESCRIBE_TAG is defined %}
+{%   set version = GIT_DESCRIBE_TAG[1:] %}
+{% else %}
+{%   set version = "0.0.0" %}
+{% endif %}
 
 package:
   name: lima-camera-slsdetector
diff --git a/conda/tango/bld.bat b/conda/tango/bld.bat
index adc93a7a7c10ad40130d0d516933da15fda5ade2..74bfc20239aa5410c915c13df224a5f6d86ae844 100644
--- a/conda/tango/bld.bat
+++ b/conda/tango/bld.bat
@@ -1 +1,7 @@
-xcopy tango\*.* %SP_DIR%\Lima\Server\camera\
+cd tango
+
+cmake -Bbuild -H. -DCMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% -DPYTHON_SITE_PACKAGES_DIR=%SP_DIR% -DCMAKE_FIND_ROOT_PATH=%LIBRARY_PREFIX%
+IF %ERRORLEVEL% NEQ 0 exit /b %ERRORLEVEL%
+
+cmake --build build --config Release --target install
+IF %ERRORLEVEL% NEQ 0 exit /b %ERRORLEVEL%
diff --git a/conda/tango/build.sh b/conda/tango/build.sh
index 662827a38e4bf57224725ac2c0d0fadbd6f071df..d02fde01b0e3691a43f6c3dcc770c029a335fd4f 100644
--- a/conda/tango/build.sh
+++ b/conda/tango/build.sh
@@ -1 +1,4 @@
-mkdir -p $SP_DIR/Lima/Server/camera && cp tango/*.* $SP_DIR/Lima/Server/camera
+#!/bin/bash
+cd tango/
+cmake -Bbuild -H. -DCMAKE_INSTALL_PREFIX=$PREFIX -DPYTHON_SITE_PACKAGES_DIR=$SP_DIR -DCMAKE_FIND_ROOT_PATH=$PREFIX
+cmake --build build --target install
diff --git a/conda/tango/meta.yaml b/conda/tango/meta.yaml
index 2d08d26053bf865113af1fc753f39c0ad325ed25..939bfa91c987d642951af0a07d11f79753a57c75 100644
--- a/conda/tango/meta.yaml
+++ b/conda/tango/meta.yaml
@@ -1,4 +1,9 @@
-{% set version = GIT_DESCRIBE_TAG[1:] %}
+# Strip the 'v' from the version tag
+{% if GIT_DESCRIBE_TAG is defined %}
+{%   set version = GIT_DESCRIBE_TAG[1:] %}
+{% else %}
+{%   set version = "0.0.0" %}
+{% endif %}
 
 package:
   name: lima-camera-slsdetector-tango
@@ -12,6 +17,10 @@ build:
   noarch: python
 
 requirements:
+  build:
+    - cmake
+    - git
+    - lima-core
   run:
     - lima-tango-server
     - lima-camera-slsdetector
diff --git a/tango/CMakeLists.txt b/tango/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..f16b461151a494869fe42b1827983e17e95ab507
--- /dev/null
+++ b/tango/CMakeLists.txt
@@ -0,0 +1,38 @@
+###########################################################################
+# This file is part of LImA, a Library for Image Acquisition
+#
+#  Copyright (C) : 2009-2019
+#  European Synchrotron Radiation Facility
+#  CS40220 38043 Grenoble Cedex 9
+#  FRANCE
+#
+#  Contact: lima@esrf.fr
+#
+#  This is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  This software is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, see <http://www.gnu.org/licenses/>.
+############################################################################
+
+cmake_minimum_required(VERSION 3.1)
+
+project(slsdetector_tango NONE)
+
+# use lima toolbox function,
+# if cmake is ran out of camera mother project, check python environment  
+if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
+  find_package(Lima REQUIRED COMPONENTS tools)
+  set(CMAKE_MODULE_PATH
+    ${LIMA_CMAKE_INCLUDE_DIRS} ${CMAKE_MODULE_PATH})
+  include(LimaTools)
+endif()
+
+limatools_install_camera_tango("SlsDetector.py")