diff --git a/app/swarm.py b/app/swarm.py
index 521a3dd249da6dd184f3d24d9c0cc4dca1d84074..1a14a2feead1ddef8003e1b0f29dfcb6fe56e9a3 100644
--- a/app/swarm.py
+++ b/app/swarm.py
@@ -20,7 +20,7 @@ class Swarm:
 
     def run(self, job):
         # Prepare argument values needed for the service creation.
-        _command = 'ocr' \
+        _command = job['service'] \
                   + ' -i /files/{}'.format(job['id']) \
                   + ' -l {}'.format(job['service_args']['lang']) \
                   + ' -o /files/{}/output'.format(job['id']) \
@@ -31,7 +31,7 @@ class Swarm:
             job['service'],
             job['service_args']['version']
         )
-        _labels = {'service': 'ocr'}
+        _labels = {'service': job['service']}
         _mounts = [
             '/home/compute/mnt/opaque/jobs:/files:rw',
         ]